X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fjournal%2Fjournal-send.c;h=4b9109a3c8a4e6f71a0f440e6280dc9dc5dda64c;hp=bc44828e1c0e0ea724d496d397d6fa6f5928e178;hb=e8e581bf256b8c0fbd430935af79fa0e8ee570a1;hpb=8b38f3cc3eb73adf9536cb73d0f319e60d42ea0c diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index bc44828e1..4b9109a3c 100644 --- a/src/journal/journal-send.c +++ b/src/journal/journal-send.c @@ -25,6 +25,7 @@ #include #include #include +#include #define SD_JOURNAL_SUPPRESS_LOCATION @@ -34,6 +35,17 @@ #define SNDBUF_SIZE (8*1024*1024) +#define ALLOCA_CODE_FUNC(f, func) \ + do { \ + size_t _fl; \ + const char *_func = (func); \ + char **_f = &(f); \ + _fl = strlen(_func) + 1; \ + *_f = alloca(_fl + 10); \ + memcpy(*_f, "CODE_FUNC=", 10); \ + memcpy(*_f + 10, _func, _fl); \ + } while(false) + /* We open a single fd, and we'll share it with the current process, * all its threads, and all its subprocesses. This means we need to * initialize it atomically, and need to operate on it atomically @@ -73,8 +85,11 @@ _public_ int sd_journal_print(int priority, const char *format, ...) { } _public_ int sd_journal_printv(int priority, const char *format, va_list ap) { - char buffer[8 + LINE_MAX], p[11]; - struct iovec iov[2]; + + /* FIXME: Instead of limiting things to LINE_MAX we could do a + C99 variable-length array on the stack here in a loop. */ + + char buffer[8 + LINE_MAX], p[11]; struct iovec iov[2]; if (priority < 0 || priority > 7) return -EINVAL; @@ -97,12 +112,11 @@ _public_ int sd_journal_printv(int priority, const char *format, va_list ap) { } static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct iovec **_iov) { + PROTECT_ERRNO; int r, n = 0, i = 0, j; struct iovec *iov = NULL; - int saved_errno; assert(_iov); - saved_errno = errno; if (extra > 0) { n = MAX(extra * 2, extra + 4); @@ -118,6 +132,7 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct while (format) { struct iovec *c; char *buffer; + va_list aq; if (i >= n) { n = MAX(i*2, 4); @@ -130,10 +145,15 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct iov = c; } - if (vasprintf(&buffer, format, ap) < 0) { + va_copy(aq, ap); + if (vasprintf(&buffer, format, aq) < 0) { + va_end(aq); r = -ENOMEM; goto fail; } + va_end(aq); + + VA_FORMAT_ADVANCE(format, ap); IOVEC_SET_STRING(iov[i++], buffer); @@ -142,7 +162,6 @@ static int fill_iovec_sprintf(const char *format, va_list ap, int extra, struct *_iov = iov; - errno = saved_errno; return i; fail: @@ -151,7 +170,6 @@ fail: free(iov); - errno = saved_errno; return r; } @@ -181,14 +199,14 @@ finish: } _public_ int sd_journal_sendv(const struct iovec *iov, int n) { + PROTECT_ERRNO; int fd, buffer_fd; struct iovec *w; uint64_t *l; - int r, i, j = 0; + int i, j = 0; struct msghdr mh; struct sockaddr_un sa; ssize_t k; - int saved_errno; union { struct cmsghdr cmsghdr; uint8_t buf[CMSG_SPACE(sizeof(int))]; @@ -198,6 +216,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { * be a tmpfs, and one that is available from early boot on * and where unprivileged users can create files. */ char path[] = "/dev/shm/journal.XXXXXX"; + bool have_syslog_identifier = false; if (_unlikely_(!iov)) return -EINVAL; @@ -205,31 +224,27 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { if (_unlikely_(n <= 0)) return -EINVAL; - saved_errno = errno; - - w = alloca(sizeof(struct iovec) * n * 5); + w = alloca(sizeof(struct iovec) * n * 5 + 3); l = alloca(sizeof(uint64_t) * n); for (i = 0; i < n; i++) { char *c, *nl; - if (_unlikely_(!iov[i].iov_base || iov[i].iov_len <= 1)) { - r = -EINVAL; - goto finish; - } + if (_unlikely_(!iov[i].iov_base || iov[i].iov_len <= 1)) + return -EINVAL; c = memchr(iov[i].iov_base, '=', iov[i].iov_len); - if (_unlikely_(!c || c == iov[i].iov_base)) { - r = -EINVAL; - goto finish; - } + if (_unlikely_(!c || c == iov[i].iov_base)) + return -EINVAL; + + have_syslog_identifier = have_syslog_identifier || + (c == (char *) iov[i].iov_base + 17 && + memcmp(iov[i].iov_base, "SYSLOG_IDENTIFIER", 17) == 0); nl = memchr(iov[i].iov_base, '\n', iov[i].iov_len); if (nl) { - if (_unlikely_(nl < c)) { - r = -EINVAL; - goto finish; - } + if (_unlikely_(nl < c)) + return -EINVAL; /* Already includes a newline? Bummer, then * let's write the variable name, then a @@ -259,12 +274,24 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { IOVEC_SET_STRING(w[j++], "\n"); } - fd = journal_fd(); - if (_unlikely_(fd < 0)) { - r = fd; - goto finish; + if (!have_syslog_identifier && + string_is_safe(program_invocation_short_name)) { + + /* Implicitly add program_invocation_short_name, if it + * is not set explicitly. We only do this for + * program_invocation_short_name, and nothing else + * since everything else is much nicer to retrieve + * from the outside. */ + + IOVEC_SET_STRING(w[j++], "SYSLOG_IDENTIFIER="); + IOVEC_SET_STRING(w[j++], program_invocation_short_name); + IOVEC_SET_STRING(w[j++], "\n"); } + fd = journal_fd(); + if (_unlikely_(fd < 0)) + return fd; + zero(sa); sa.sun_family = AF_UNIX; strncpy(sa.sun_path, "/run/systemd/journal/socket", sizeof(sa.sun_path)); @@ -276,37 +303,29 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { mh.msg_iovlen = j; k = sendmsg(fd, &mh, MSG_NOSIGNAL); - if (k >= 0) { - r = 0; - goto finish; - } + if (k >= 0) + return 0; - if (errno != EMSGSIZE && errno != ENOBUFS) { - r = -errno; - goto finish; - } + if (errno != EMSGSIZE && errno != ENOBUFS) + return -errno; /* Message doesn't fit... Let's dump the data in a temporary * file and just pass a file descriptor of it to the other * side */ buffer_fd = mkostemp(path, O_CLOEXEC|O_RDWR); - if (buffer_fd < 0) { - r = -errno; - goto finish; - } + if (buffer_fd < 0) + return -errno; if (unlink(path) < 0) { close_nointr_nofail(buffer_fd); - r = -errno; - goto finish; + return -errno; } n = writev(buffer_fd, w, j); if (n < 0) { close_nointr_nofail(buffer_fd); - r = -errno; - goto finish; + return -errno; } mh.msg_iov = NULL; @@ -327,17 +346,59 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { k = sendmsg(fd, &mh, MSG_NOSIGNAL); close_nointr_nofail(buffer_fd); - if (k < 0) { - r = -errno; - goto finish; - } + if (k < 0) + return -errno; - r = 0; + return 0; +} -finish: - errno = saved_errno; +static int fill_iovec_perror_and_send(const char *message, int skip, struct iovec iov[]) { + PROTECT_ERRNO; + size_t n, k; - return r; + k = isempty(message) ? 0 : strlen(message) + 2; + n = 8 + k + 256 + 1; + + for (;;) { + char buffer[n]; + char* j; + + errno = 0; + j = strerror_r(_saved_errno_, buffer + 8 + k, n - 8 - k); + if (errno == 0) { + char error[6 + 10 + 1]; /* for a 32bit value */ + + if (j != buffer + 8 + k) + memmove(buffer + 8 + k, j, strlen(j)+1); + + memcpy(buffer, "MESSAGE=", 8); + + if (k > 0) { + memcpy(buffer + 8, message, k - 2); + memcpy(buffer + 8 + k - 2, ": ", 2); + } + + snprintf(error, sizeof(error), "ERRNO=%u", _saved_errno_); + char_array_0(error); + + IOVEC_SET_STRING(iov[skip+0], "PRIORITY=3"); + IOVEC_SET_STRING(iov[skip+1], buffer); + IOVEC_SET_STRING(iov[skip+2], error); + + return sd_journal_sendv(iov, skip + 3); + } + + if (errno != ERANGE) + return -errno; + + n *= 2; + } +} + +_public_ int sd_journal_perror(const char *message) { + struct iovec iovec[3]; + + return fill_iovec_perror_and_send(message, 0, iovec); } _public_ int sd_journal_stream_fd(const char *identifier, int priority, int level_prefix) { @@ -379,7 +440,7 @@ _public_ int sd_journal_stream_fd(const char *identifier, int priority, int leve memcpy(header, identifier, l); header[l++] = '\n'; - header[l++] = '\n'; + header[l++] = '\n'; /* unit id */ header[l++] = '0' + priority; header[l++] = '\n'; header[l++] = '0' + !!level_prefix; @@ -420,7 +481,6 @@ _public_ int sd_journal_printv_with_location(int priority, const char *file, con char buffer[8 + LINE_MAX], p[11]; struct iovec iov[5]; char *f; - size_t fl; if (priority < 0 || priority > 7) return -EINVAL; @@ -438,10 +498,7 @@ _public_ int sd_journal_printv_with_location(int priority, const char *file, con /* func is initialized from __func__ which is not a macro, but * a static const char[], hence cannot easily be prefixed with * CODE_FUNC=, hence let's do it manually here. */ - fl = strlen(func); - f = alloca(fl + 10); - memcpy(f, "CODE_FUNC=", 10); - memcpy(f + 10, func, fl + 1); + ALLOCA_CODE_FUNC(f, func); zero(iov); IOVEC_SET_STRING(iov[0], buffer); @@ -458,7 +515,6 @@ _public_ int sd_journal_send_with_location(const char *file, const char *line, c va_list ap; struct iovec *iov = NULL; char *f; - size_t fl; va_start(ap, format); i = fill_iovec_sprintf(format, ap, 3, &iov); @@ -469,10 +525,7 @@ _public_ int sd_journal_send_with_location(const char *file, const char *line, c goto finish; } - fl = strlen(func); - f = alloca(fl + 10); - memcpy(f, "CODE_FUNC=", 10); - memcpy(f + 10, func, fl + 1); + ALLOCA_CODE_FUNC(f, func); IOVEC_SET_STRING(iov[0], file); IOVEC_SET_STRING(iov[1], line); @@ -489,10 +542,13 @@ finish: return r; } -_public_ int sd_journal_sendv_with_location(const char *file, const char *line, const char *func, const struct iovec *iov, int n) { +_public_ int sd_journal_sendv_with_location( + const char *file, const char *line, + const char *func, + const struct iovec *iov, int n) { + struct iovec *niov; char *f; - size_t fl; if (_unlikely_(!iov)) return -EINVAL; @@ -503,10 +559,7 @@ _public_ int sd_journal_sendv_with_location(const char *file, const char *line, niov = alloca(sizeof(struct iovec) * (n + 3)); memcpy(niov, iov, sizeof(struct iovec) * n); - fl = strlen(func); - f = alloca(fl + 10); - memcpy(f, "CODE_FUNC=", 10); - memcpy(f + 10, func, fl + 1); + ALLOCA_CODE_FUNC(f, func); IOVEC_SET_STRING(niov[n++], file); IOVEC_SET_STRING(niov[n++], line); @@ -514,3 +567,20 @@ _public_ int sd_journal_sendv_with_location(const char *file, const char *line, return sd_journal_sendv(niov, n); } + +_public_ int sd_journal_perror_with_location( + const char *file, const char *line, + const char *func, + const char *message) { + + struct iovec iov[6]; + char *f; + + ALLOCA_CODE_FUNC(f, func); + + IOVEC_SET_STRING(iov[0], file); + IOVEC_SET_STRING(iov[1], line); + IOVEC_SET_STRING(iov[2], f); + + return fill_iovec_perror_and_send(message, 3, iov); +}