linux-kernel - [PATCH] thunderbolt: Check for null pointer after calling kmemdup

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: <20220105064244.2316847-1-jiasheng@iscas.ac.cn>
Date:   Wed,  5 Jan 2022 14:42:44 +0800
From:   Jiasheng Jiang <jiasheng@...as.ac.cn>
To:     andreas.noever@...il.com, michael.jamet@...el.com,
        mika.westerberg@...ux.intel.com, YehezkelShB@...il.com
Cc:     linux-usb@...r.kernel.org, linux-kernel@...r.kernel.org,
        Jiasheng Jiang <jiasheng@...as.ac.cn>
Subject: [PATCH] thunderbolt:  Check for null pointer after calling kmemdup

As the possible failure of the allocation, kmemdup() may return NULL
pointer.
Like alloc_switch(), it might be better to check it.
Therefore, icm_icl_set_uuid() and icm_handle_event() should also check
the return value of kmemdup().
As for icm_icl_set_uuid(), which is assigned to icm->set_uuid, the
return value of icm->set_uuid needs to check.
And for icm_handle_event(), just free 'n' and directly return is enough,
same as the way to handle the failure of kmalloc().

Fixes: 3cdb9446a117 ("thunderbolt: Add support for Intel Ice Lake")
Fixes: f67cf491175a ("thunderbolt: Add support for Internal Connection Manager (ICM)")
Signed-off-by: Jiasheng Jiang <jiasheng@...as.ac.cn>
---
 drivers/thunderbolt/icm.c | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/drivers/thunderbolt/icm.c b/drivers/thunderbolt/icm.c
index 2f30b816705a..09ab31ea9128 100644
--- a/drivers/thunderbolt/icm.c
+++ b/drivers/thunderbolt/icm.c
@@ -109,7 +109,7 @@ struct icm {
 	int (*driver_ready)(struct tb *tb,
 			    enum tb_security_level *security_level,
 			    u8 *proto_version, size_t *nboot_acl, bool *rpm);
-	void (*set_uuid)(struct tb *tb);
+	int (*set_uuid)(struct tb *tb);
 	void (*device_connected)(struct tb *tb,
 				 const struct icm_pkg_header *hdr);
 	void (*device_disconnected)(struct tb *tb,
@@ -1643,7 +1643,7 @@ icm_icl_driver_ready(struct tb *tb, enum tb_security_level *security_level,
 	return 0;
 }
 
-static void icm_icl_set_uuid(struct tb *tb)
+static int icm_icl_set_uuid(struct tb *tb)
 {
 	struct tb_nhi *nhi = tb->nhi;
 	u32 uuid[4];
@@ -1654,6 +1654,10 @@ static void icm_icl_set_uuid(struct tb *tb)
 	uuid[3] = 0xffffffff;
 
 	tb->root_switch->uuid = kmemdup(uuid, sizeof(uuid), GFP_KERNEL);
+	if (!tb->root_switch->uuid)
+		return -ENOMEM;
+
+	return 0;
 }
 
 static void
@@ -1739,6 +1743,11 @@ static void icm_handle_event(struct tb *tb, enum tb_cfg_pkg_type type,
 
 	INIT_WORK(&n->work, icm_handle_notification);
 	n->pkg = kmemdup(buf, size, GFP_KERNEL);
+	if (!n->pkg) {
+		kfree(n);
+		return;
+	}
+
 	n->tb = tb;
 
 	queue_work(tb->wq, &n->work);
@@ -2152,8 +2161,11 @@ static int icm_start(struct tb *tb)
 	tb->root_switch->no_nvm_upgrade = !icm->can_upgrade_nvm;
 	tb->root_switch->rpm = icm->rpm;
 
-	if (icm->set_uuid)
-		icm->set_uuid(tb);
+	if (icm->set_uuid) {
+		ret = icm->set_uuid(tb);
+		if (ret)
+			return ret;
+	}
 
 	ret = tb_switch_add(tb->root_switch);
 	if (ret) {
-- 
2.25.1