linux-hardening.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] pstore/zone: Add a null pointer check to the psz_kmsg_read
@ 2024-01-18 10:02 Kunwu Chan
  2024-02-01 18:10 ` Kees Cook
  0 siblings, 1 reply; 2+ messages in thread
From: Kunwu Chan @ 2024-01-18 10:02 UTC (permalink / raw)
  To: keescook, tony.luck, gpiccoli; +Cc: linux-hardening, linux-kernel, Kunwu Chan

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>
---
 fs/pstore/zone.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
index 2770746bb7aa..abca117725c8 100644
--- a/fs/pstore/zone.c
+++ b/fs/pstore/zone.c
@@ -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) {
-- 
2.39.2


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] pstore/zone: Add a null pointer check to the psz_kmsg_read
  2024-01-18 10:02 [PATCH] pstore/zone: Add a null pointer check to the psz_kmsg_read Kunwu Chan
@ 2024-02-01 18:10 ` Kees Cook
  0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2024-02-01 18:10 UTC (permalink / raw)
  To: tony.luck, gpiccoli, Kunwu Chan; +Cc: Kees Cook, linux-hardening, linux-kernel

On Thu, 18 Jan 2024 18:02:06 +0800, Kunwu Chan wrote:
> kasprintf() returns a pointer to dynamically allocated memory
> which can be NULL upon failure. Ensure the allocation was successful
> by checking the pointer validity.
> 
> 

Applied to for-next/pstore, thanks!

[1/1] pstore/zone: Add a null pointer check to the psz_kmsg_read
      https://git.kernel.org/kees/c/69f381e67d6f

Take care,

-- 
Kees Cook


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-02-01 18:11 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-18 10:02 [PATCH] pstore/zone: Add a null pointer check to the psz_kmsg_read Kunwu Chan
2024-02-01 18:10 ` Kees Cook

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).