linux-kernel - [PATCH v2] pstore/zone: avoid dereferencing zero sized ptr after init zones

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20250110125714.2594719-1-eugen.hristev@linaro.org>
Date: Fri, 10 Jan 2025 14:57:14 +0200
From: Eugen Hristev <eugen.hristev@...aro.org>
To: liaoweixiong@...winnertech.com,
	linux-hardening@...r.kernel.org,
	linux-kernel@...r.kernel.org
Cc: kees@...nel.org,
	gpiccoli@...lia.com,
	tony.luck@...el.com,
	Eugen Hristev <eugen.hristev@...aro.org>
Subject: [PATCH v2] pstore/zone: avoid dereferencing zero sized ptr after init zones

In psz_init_zones, if the requested area has a total_size less than
record_size, kcalloc will be called with c == 0 and will return
ZERO_SIZE_PTR.
Further, this will lead to an oops.

With this patch, in this scenario, it will look like this :
[    6.865545] pstore_zone:     total size : 28672 Bytes
[    6.865547] pstore_zone:     kmsg size : 65536 Bytes
[    6.865549] pstore_zone:     pmsg size : 0 Bytes
[    6.865551] pstore_zone:     console size : 0 Bytes
[    6.865553] pstore_zone:     ftrace size : 0 Bytes
[    6.872095] pstore_zone: zone dmesg total_size too small
[    6.878234] pstore_zone: alloc zones failed

Signed-off-by: Eugen Hristev <eugen.hristev@...aro.org>
---
Changes in v2:
- reworked to check for c==0 instead of ZERO_SIZE_PTR as suggested by Kees Cook

 fs/pstore/zone.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fs/pstore/zone.c b/fs/pstore/zone.c
index 694db616663f..ceb5639a0629 100644
--- a/fs/pstore/zone.c
+++ b/fs/pstore/zone.c
@@ -1212,6 +1212,11 @@ static struct pstore_zone **psz_init_zones(enum pstore_type_id type,
 	}
 
 	c = total_size / record_size;
+	if (unlikely(!c)) {
+		pr_err("zone %s total_size too small\n", name);
+		return ERR_PTR(-EINVAL);
+	}
+
 	zones = kcalloc(c, sizeof(*zones), GFP_KERNEL);
 	if (!zones) {
 		pr_err("allocate for zones %s failed\n", name);
-- 
2.43.0