Commit d058315c authored by Kunwu Chan's avatar Kunwu Chan Committed by Zeng Heng
Browse files

pstore/zone: Add a null pointer check to the psz_kmsg_read 

mainline inclusion
from mainline-v6.9-rc1
commit 98bc7e26e14fbb26a6abf97603d59532475e97f8
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9QGKD
CVE: CVE-2024-35940

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98bc7e26e14fbb26a6abf97603d59532475e97f8



--------------------------------

kasprintf() returns a pointer to dynamically allocated memory
which can be NULL upon failure. Ensure the allocation was successful
by checking the pointer validity.

Signed-off-by: default avatarKunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20240118100206.213928-1-chentao@kylinos.cn


Signed-off-by: default avatarKees Cook <keescook@chromium.org>
Signed-off-by: default avatarZeng Heng <zengheng4@huawei.com>
parent f300accf

fs/pstore/zone.c

+2 −0
Original line number Diff line number Diff line
@@ -973,6 +973,8 @@ static ssize_t psz_kmsg_read(struct pstore_zone *zone, 
		char *buf = kasprintf(GFP_KERNEL, "%s: Total %d times\n",

				      kmsg_dump_reason_str(record->reason),

				      record->count);

		if (!buf)

			return -ENOMEM;

		hlen = strlen(buf);

		record->buf = krealloc(buf, hlen + size, GFP_KERNEL);

		if (!record->buf) {