]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: rtw89: coex: check NULL return of kmalloc in btc_fw_set_monreg()
authorPei Xiao <xiaopei01@kylinos.cn>
Wed, 30 Oct 2024 03:20:58 +0000 (11:20 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Dec 2024 12:53:21 +0000 (13:53 +0100)
[ Upstream commit 81df5ed446b448bdc327b7c7f0b50121fc1f4aa2 ]

kmalloc may fail, return value might be NULL and will cause
NULL pointer dereference. Add check NULL return of kmalloc in
btc_fw_set_monreg().

Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
Fixes: b952cb0a6e2d ("wifi: rtw89: coex: Add register monitor report v7 format")
Signed-off-by: Ping-Ke Shih <pkshih@realtek.com>
Link: https://patch.msgid.link/516a91f3997534f708af43c7592cbafdd53dd599.1730253508.git.xiaopei01@kylinos.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/realtek/rtw89/coex.c

index 24929ef534e08b0ff81e81c1bc575c34d77ea8bf..3f4754b7c9d0915871bb45954bb280ac0248c8cf 100644 (file)
@@ -2449,6 +2449,8 @@ static void btc_fw_set_monreg(struct rtw89_dev *rtwdev)
        if (ver->fcxmreg == 7) {
                sz = struct_size(v7, regs, n);
                v7 = kmalloc(sz, GFP_KERNEL);
+               if (!v7)
+                       return;
                v7->type = RPT_EN_MREG;
                v7->fver = ver->fcxmreg;
                v7->len = n;
@@ -2463,6 +2465,8 @@ static void btc_fw_set_monreg(struct rtw89_dev *rtwdev)
        } else {
                sz = struct_size(v1, regs, n);
                v1 = kmalloc(sz, GFP_KERNEL);
+               if (!v1)
+                       return;
                v1->fver = ver->fcxmreg;
                v1->reg_num = n;
                memcpy(v1->regs, chip->mon_reg, flex_array_size(v1, regs, n));