[<prev] [next>] [day] [month] [year] [list]
Message-ID: <tencent_D9887936F780A393C232DC48C9EC3F1D4405@qq.com>
Date: Tue, 22 Feb 2022 10:00:24 +0800
From: xkernel.wang@...mail.com
To: gregkh@...uxfoundation.org
Cc: dan.carpenter@...cle.com, jerome.pouiller@...abs.com,
linux-staging@...ts.linux.dev, linux-kernel@...r.kernel.org,
Xiaoke Wang <xkernel.wang@...mail.com>
Subject: [PATCH v3 2/2] staging: wfx: check the return value of devm_kmalloc()
From: Xiaoke Wang <xkernel.wang@...mail.com>
devm_kmalloc() returns a pointer to allocated memory on success, NULL
on failure. While there is a memory allocation of devm_kmalloc()
without proper check. It is better to check the return value of it to
prevent wrong memory access.
And I use the err label which is introduced by the previous patch to
handle the error.
Link: https://lore.kernel.org/r/tencent_24A24A3EFF61206ECCC4B94B1C5C1454E108@qq.com
Reviewed-by: Dan Carpenter <dan.carpenter@...cle.com>
Reviewed-by: Jérôme Pouiller <jerome.pouiller@...abs.com>
Signed-off-by: Xiaoke Wang <xkernel.wang@...mail.com>
---
Note:
I only send this one as the another patch had been applied.
And I put the Link of the applied patch as a reference.
Changelog:
v1->v2 update the description.
v2->v3 resolve a conflict with the staging-testing tree.
drivers/staging/wfx/main.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/staging/wfx/main.c b/drivers/staging/wfx/main.c
index c4b062b..23ae7d4 100644
--- a/drivers/staging/wfx/main.c
+++ b/drivers/staging/wfx/main.c
@@ -293,6 +293,9 @@ struct wfx_dev *wfx_init_common(struct device *dev, const struct wfx_platform_da
hw->wiphy->n_iface_combinations = ARRAY_SIZE(wfx_iface_combinations);
hw->wiphy->iface_combinations = wfx_iface_combinations;
hw->wiphy->bands[NL80211_BAND_2GHZ] = devm_kmalloc(dev, sizeof(wfx_band_2ghz), GFP_KERNEL);
+ if (!hw->wiphy->bands[NL80211_BAND_2GHZ])
+ goto err;
+
/* FIXME: also copy wfx_rates and wfx_2ghz_chantable */
memcpy(hw->wiphy->bands[NL80211_BAND_2GHZ], &wfx_band_2ghz, sizeof(wfx_band_2ghz));
--
Powered by blists - more mailing lists