From: xkernel.wang@foxmail.com
To: jerome.pouiller@silabs.com, gregkh@linuxfoundation.org,
dan.carpenter@oracle.com
Cc: linux-staging@lists.linux.dev, linux-kernel@vger.kernel.org,
Xiaoke Wang <xkernel.wang@foxmail.com>
Subject: [PATCH v2 2/2] staging: wfx: check the return value of devm_kmalloc()
Date: Fri, 18 Feb 2022 22:04:02 +0800 [thread overview]
Message-ID: <tencent_3CB9DC1C721449E14B4AD3FF65201CCC4C08@qq.com> (raw)
In-Reply-To: <tencent_24A24A3EFF61206ECCC4B94B1C5C1454E108@qq.com>
From: Xiaoke Wang <xkernel.wang@foxmail.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.
Signed-off-by: Xiaoke Wang <xkernel.wang@foxmail.com>
---
Changelog
v1->v2 update the description.
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 9ff69c5..85fcdc3 100644
--- a/drivers/staging/wfx/main.c
+++ b/drivers/staging/wfx/main.c
@@ -294,6 +294,9 @@ struct wfx_dev *wfx_init_common(struct device *dev,
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));
--
next prev parent reply other threads:[~2022-02-18 14:04 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-18 13:59 [PATCH v2 1/2] staging: wfx: fix an error handling in wfx_init_common() xkernel.wang
2022-02-18 14:04 ` xkernel.wang [this message]
2022-02-18 14:12 ` [PATCH v2 2/2] staging: wfx: check the return value of devm_kmalloc() Jérôme Pouiller
2022-02-21 17:05 ` Greg KH
2022-02-18 14:09 ` [PATCH v2 1/2] staging: wfx: fix an error handling in wfx_init_common() Jérôme Pouiller
2022-02-18 14:43 ` Dan Carpenter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tencent_3CB9DC1C721449E14B4AD3FF65201CCC4C08@qq.com \
--to=xkernel.wang@foxmail.com \
--cc=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=jerome.pouiller@silabs.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-staging@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®