]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
pstore/zone: Add a null pointer check to the psz_kmsg_read
authorKunwu Chan <chentao@kylinos.cn>
Thu, 18 Jan 2024 10:02:06 +0000 (18:02 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 13 Apr 2024 10:59:41 +0000 (12:59 +0200)
[ Upstream commit 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: Kunwu Chan <chentao@kylinos.cn>
Link: https://lore.kernel.org/r/20240118100206.213928-1-chentao@kylinos.cn
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/pstore/zone.c

index b50fc33f2ab299dd0ad3cabcb5058a36d322e32a..2426fb6794fd3a1f47d50d1bc85bfe4c583b01fc 100644 (file)
@@ -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) {