X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournal-send.c;h=bd8f8872c9d54cf0050664e5a22ad3cd989637f0;hb=ee55db41442ad8055f5a84a339b1e0e22bc037c4;hp=b192f1fb888738cfaa25a80ac7ee6e14594d1324;hpb=a6e87e90ede66815989ba2db92a07102a69906fe;p=elogind.git diff --git a/src/journal/journal-send.c b/src/journal/journal-send.c index b192f1fb8..bd8f8872c 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 @@ -121,6 +133,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); @@ -133,10 +146,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); @@ -201,6 +219,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; @@ -210,7 +229,7 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { 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++) { @@ -227,6 +246,9 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { goto finish; } + have_syslog_identifier = + have_syslog_identifier || (c == 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)) { @@ -262,6 +284,20 @@ _public_ int sd_journal_sendv(const struct iovec *iov, int n) { IOVEC_SET_STRING(w[j++], "\n"); } + 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)) { r = fd; @@ -480,7 +516,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; @@ -498,10 +533,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); @@ -518,7 +550,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); @@ -529,10 +560,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); @@ -556,7 +584,6 @@ _public_ int sd_journal_sendv_with_location( struct iovec *niov; char *f; - size_t fl; if (_unlikely_(!iov)) return -EINVAL; @@ -567,10 +594,7 @@ _public_ int sd_journal_sendv_with_location( 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); @@ -585,13 +609,9 @@ _public_ int sd_journal_perror_with_location( const char *message) { struct iovec iov[6]; - size_t fl; char *f; - 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);