From: zhanchengbin <zhanchengbin1@huawei.com>
To: Theodore Ts'o <tytso@mit.edu>
Cc: <linux-ext4@vger.kernel.org>, <liuzhiqiang26@huawei.com>,
<linfeilong@huawei.com>
Subject: [PATCH 1/6] e2fsck: set s->len=0 if malloc() fails in alloc_string()
Date: Fri, 3 Dec 2021 14:26:16 +0800 [thread overview]
Message-ID: <622dc317-a9cb-2541-b357-a868d31a9605@huawei.com> (raw)
In-Reply-To: <37c58382-9714-7e99-6c4d-01b78cfdbd26@huawei.com>
In alloc_string(), when malloc fails, len in the
string structure should be 0.
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
---
e2fsck/logfile.c | 2 ++
1 file changed, 2 insertions(+)
diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c
index 63e9a12f..f2227ad5 100644
--- a/e2fsck/logfile.c
+++ b/e2fsck/logfile.c
@@ -32,6 +32,8 @@ static void alloc_string(struct string *s, int len)
{
s->s = malloc(len);
/* e2fsck_allocate_memory(ctx, len, "logfile name"); */
+ if (s->s == NULL)
+ s->len = 0;
s->len = len;
s->end = 0;
}
--
2.23.0
next prev parent reply other threads:[~2021-12-03 6:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-03 6:24 [PATCH 0/6] solve memory leak and check whether NULL pointer zhanchengbin
2021-12-03 6:26 ` zhanchengbin [this message]
2021-12-03 6:31 ` [PATCH 1/6] e2fsck: set s->len=0 if malloc() fails in alloc_string() Zhiqiang Liu
2021-12-03 6:27 ` [PATCH 2/6] lib/ss: check whether argp is null before accessing it in ss_execute_command() zhanchengbin
2021-12-03 6:28 ` [PATCH 3/6] lib/support: check whether inump is null before accessing it in quota_set_sb_inum() zhanchengbin
2021-12-03 6:29 ` [PATCH 4/6] e2fsprogs: call ext2fs_badblocks_list_free() to free list in exception branch zhanchengbin
2021-12-03 6:30 ` [PATCH 5/6] e2fsck: check whether ldesc is null before accessing it in end_problem_latch() zhanchengbin
2021-12-03 6:31 ` [PATCH 6/6] lib/ext2fs: call ext2fs_free_mem() to free &io->name in exception branch zhanchengbin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=622dc317-a9cb-2541-b357-a868d31a9605@huawei.com \
--to=zhanchengbin1@huawei.com \
--cc=linfeilong@huawei.com \
--cc=linux-ext4@vger.kernel.org \
--cc=liuzhiqiang26@huawei.com \
--cc=tytso@mit.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox