SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journal-authenticate: refuse invalid start and interval parameters

Browse Source 
We have already checked that in journal_file_fss_load().
Let's also check the same in loading user provided key.
This commit is contained in:
Yu Watanabe
2026-06-27 20:08:53 +09:00
parent c286c0daaf
commit 79acf8894b
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd/sd-journal/journal-authenticate.c
+10 -3
View File
@@ -496,7 +496,6 @@ int journal_file_parse_verification_key(JournalFile *f, const char *key) {
_cleanup_(erase_and_freep) uint8_t *seed = NULL;
size_t seed_size;
const char *k;
unsigned long long start, interval;
int r;
assert(f);
@@ -530,12 +529,20 @@ int journal_file_parse_verification_key(JournalFile *f, const char *key) {
return -EKEYREJECTED;
k++;
r = sscanf(k, "%llx-%llx", &start, &interval);
uint64_t start, interval;
r = sscanf(k, "%"PRIx64"-%"PRIx64, &start, &interval);
if (r != 2)
return -EKEYREJECTED;
if (start == 0 || interval == 0)
return -EKEYREJECTED;
uint64_t start_usec;
if (!MUL_SAFE(&start_usec, start, interval))
return -EKEYREJECTED;
f->fsprg_seed = IOVEC_MAKE(TAKE_PTR(seed), seed_size);
f->fss_start_usec = start * interval;
f->fss_start_usec = start_usec;
f->fss_interval_usec = interval;
return 0;