shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-02-07 05:57:46 +03:00
Code

journal-remote: set a limit on the number of fields in a message

Browse Source 
Existing use of E2BIG is replaced with ENOBUFS (entry too long), and E2BIG is
reused for the new error condition (too many fields).

This matches the change done for systemd-journald, hence forming the second
part of the fix for CVE-2018-16865
(https://bugzilla.redhat.com/show_bug.cgi?id=1653861).
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2018-12-07 10:48:10 +01:00
parent 7fdb237f54
commit ef4d6abe7c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/journal-remote/journal-remote-main.c
View File

@ -222,9 +222,12 @@ static int process_http_upload(
if (r == -EAGAIN) if (r == -EAGAIN)
break; break;
if (r < 0) { if (r < 0) {
if (r == -E2BIG) if (r == -ENOBUFS)
log_warning_errno(r, "Entry is too above maximum of %u, aborting connection %p.", log_warning_errno(r, "Entry is above the maximum of %u, aborting connection %p.",
DATA_SIZE_MAX, connection); DATA_SIZE_MAX, connection);
else if (r == -E2BIG)
log_warning_errno(r, "Entry with more fields than the maximum of %u, aborting connection %p.",
ENTRY_FIELD_COUNT_MAX, connection);
else else
log_warning_errno(r, "Failed to process data, aborting connection %p: %m", log_warning_errno(r, "Failed to process data, aborting connection %p: %m",
connection); connection);

3
src/journal-remote/journal-remote.c
View File

@ -407,6 +407,9 @@ int journal_remote_handle_raw_source(
log_debug("%zu active sources remaining", s->active); log_debug("%zu active sources remaining", s->active);
return 0; return 0;
} else if (r == -E2BIG) { } else if (r == -E2BIG) {
log_notice("Entry with too many fields, skipped");
return 1;
} else if (r == -ENOBUFS) {
log_notice("Entry too big, skipped"); log_notice("Entry too big, skipped");
return 1; return 1;
} else if (r == -EAGAIN) { } else if (r == -EAGAIN) {

5
src/shared/journal-importer.c
View File

@ -23,6 +23,9 @@ enum {
}; };
static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) { static int iovw_put(struct iovec_wrapper *iovw, void* data, size_t len) {
if (iovw->count >= ENTRY_FIELD_COUNT_MAX)
return -E2BIG;
if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1)) if (!GREEDY_REALLOC(iovw->iovec, iovw->size_bytes, iovw->count + 1))
return log_oom(); return log_oom();
@ -97,7 +100,7 @@ static int get_line(JournalImporter *imp, char **line, size_t *size) {
imp->scanned = imp->filled; imp->scanned = imp->filled;
if (imp->scanned >= DATA_SIZE_MAX) if (imp->scanned >= DATA_SIZE_MAX)
return log_error_errno(SYNTHETIC_ERRNO(E2BIG), return log_error_errno(SYNTHETIC_ERRNO(ENOBUFS),
"Entry is bigger than %u bytes.", "Entry is bigger than %u bytes.",
DATA_SIZE_MAX); DATA_SIZE_MAX);