From a26abc5a1e2fff9d679887445d313b4b9f946f64 Mon Sep 17 00:00:00 2001 From: zhanchengbin Date: Fri, 31 Dec 2021 15:41:41 +0800 Subject: e2fsck: handle malloc() failure when computing the log file name Link: https://lore.kernel.org/r/6d2844c7-0fd2-e432-3c7e-bb8de8c8a186@huawei.com Signed-off-by: zhanchengbin Signed-off-by: Theodore Ts'o --- e2fsck/logfile.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'e2fsck/logfile.c') diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c index 63e9a12f..7bdeae19 100644 --- a/e2fsck/logfile.c +++ b/e2fsck/logfile.c @@ -32,7 +32,7 @@ static void alloc_string(struct string *s, int len) { s->s = malloc(len); /* e2fsck_allocate_memory(ctx, len, "logfile name"); */ - s->len = len; + s->len = s->s ? len : 0; s->end = 0; } -- cgit v1.2.3 From aa5732531f76e405a17415a4217f86cf8270d589 Mon Sep 17 00:00:00 2001 From: Theodore Ts'o Date: Wed, 10 Aug 2022 22:48:13 -0400 Subject: e2fsck: handle invalid percent expansions in the log filename Add a missing default: case when expanding percent expansions in the log file specified in /etc/e2fsck.conf. Addresses-Coverity-Bug: 1500757 Signed-off-by: Theodore Ts'o --- e2fsck/logfile.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'e2fsck/logfile.c') diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c index 7bdeae19..9d79eed2 100644 --- a/e2fsck/logfile.c +++ b/e2fsck/logfile.c @@ -155,6 +155,9 @@ static void expand_percent_expression(e2fsck_t ctx, char ch, case 'Y': sprintf(buf, "%d", tm->tm_year + 1900); break; + default: + sprintf(buf, "%%%c", ch); + break; } append_string(s, buf, 0); } -- cgit v1.2.3