morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

sd-journal: use new() instead of newa() if too many items will be added

Browse Source 
For safety, as the size may not be under our control.
This commit is contained in:
Yu Watanabe
2022-10-12 15:45:55 +09:00
parent 80c5cb825a
commit 52bcf45a6c
1 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/libsystemd/sd-journal/journal-file.c
View File

@@ -2232,10 +2232,11 @@ int journal_file_append_entry(
Object **ret_object,
uint64_t *ret_offset) {
_cleanup_free_ EntryItem *items_alloc = NULL;
EntryItem *items;
int r;
uint64_t xor_hash = 0;
struct dual_timestamp _ts;
int r;
assert(f);
assert(f->header);
@@ -2262,7 +2263,15 @@ int journal_file_append_entry(
return r;
#endif
items = newa(EntryItem, n_iovec);
if (n_iovec < ALLOCA_MAX / sizeof(EntryItem) / 2)
items = newa(EntryItem, n_iovec);
else {
items_alloc = new(EntryItem, n_iovec);
if (!items_alloc)
return -ENOMEM;
items = items_alloc;
}
for (size_t i = 0; i < n_iovec; i++) {
uint64_t p;
@@ -3975,10 +3984,11 @@ int journal_file_dispose(int dir_fd, const char *fname) {
}
int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint64_t p) {
_cleanup_free_ EntryItem *items_alloc = NULL;
EntryItem *items;
uint64_t q, n, xor_hash = 0;
const sd_id128_t *boot_id;
dual_timestamp ts;
EntryItem *items;
int r;
assert(from);
@@ -3996,7 +4006,16 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6
boot_id = &o->entry.boot_id;
n = journal_file_entry_n_items(from, o);
items = newa(EntryItem, n);
if (n < ALLOCA_MAX / sizeof(EntryItem) / 2)
items = newa(EntryItem, n);
else {
items_alloc = new(EntryItem, n);
if (!items_alloc)
return -ENOMEM;
items = items_alloc;
}
for (uint64_t i = 0; i < n; i++) {
uint64_t h;