chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: fix some xsprrintf() buffer size fallout
[elogind.git]
/
src
/
journal
/
journald-console.c
diff --git
a/src/journal/journald-console.c
b/src/journal/journald-console.c
index 1ee3afeacc37010b7411e34019a3e6250a508417..5363aaa4ffa1d86e984998f4372c2d08dec6e733 100644
(file)
--- a/
src/journal/journald-console.c
+++ b/
src/journal/journald-console.c
@@
-48,14
+48,14
@@
void server_forward_console(
int priority,
const char *identifier,
const char *message,
int priority,
const char *identifier,
const char *message,
- struct ucred *ucred) {
+
const
struct ucred *ucred) {
struct iovec iovec[5];
struct iovec iovec[5];
- char header_pid[16];
struct timespec ts;
struct timespec ts;
- char tbuf[4 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
+ char tbuf[sizeof("[] ")-1 + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
+ char header_pid[sizeof("[]: ")-1 + DECIMAL_STR_MAX(pid_t)];
int n = 0, fd;
int n = 0, fd;
- char *ident_buf = NULL;
+
_cleanup_free_
char *ident_buf = NULL;
const char *tty;
assert(s);
const char *tty;
assert(s);
@@
-67,9
+67,9
@@
void server_forward_console(
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
/* First: timestamp */
if (prefix_timestamp()) {
assert_se(clock_gettime(CLOCK_MONOTONIC, &ts) == 0);
-
snprintf(tbuf, sizeof(tbuf), "[%5llu.%06llu
] ",
-
(unsigned long long)
ts.tv_sec,
-
(unsigned long long)
ts.tv_nsec / 1000);
+
xsprintf(tbuf, "[%5"PRI_TIME".%06ld
] ",
+ ts.tv_sec,
+ ts.tv_nsec / 1000);
IOVEC_SET_STRING(iovec[n++], tbuf);
}
IOVEC_SET_STRING(iovec[n++], tbuf);
}
@@
-80,8
+80,7
@@
void server_forward_console(
identifier = ident_buf;
}
identifier = ident_buf;
}
- snprintf(header_pid, sizeof(header_pid), "[%lu]: ", (unsigned long) ucred->pid);
- char_array_0(header_pid);
+ xsprintf(header_pid, "["PID_FMT"]: ", ucred->pid);
if (identifier)
IOVEC_SET_STRING(iovec[n++], identifier);
if (identifier)
IOVEC_SET_STRING(iovec[n++], identifier);
@@
-100,15
+99,12
@@
void server_forward_console(
fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0) {
fd = open_terminal(tty, O_WRONLY|O_NOCTTY|O_CLOEXEC);
if (fd < 0) {
- log_debug
("Failed to open %s for logging: %s", tty, strerror(errno)
);
-
goto finish
;
+ log_debug
_errno(errno, "Failed to open %s for logging: %m", tty
);
+
return
;
}
if (writev(fd, iovec, n) < 0)
}
if (writev(fd, iovec, n) < 0)
- log_debug("Failed to write to %s for logging: %s", tty, strerror(errno));
-
- close_nointr_nofail(fd);
+ log_debug_errno(errno, "Failed to write to %s for logging: %m", tty);
-finish:
- free(ident_buf);
+ safe_close(fd);
}
}