From: Duoming Zhou <duoming@zju.edu.cn>
To: linux-kernel@vger.kernel.org
Cc: brcm80211-dev-list.pdl@broadcom.com, brcm80211@lists.linux.dev,
linux-wireless@vger.kernel.org, justinstitt@google.com,
quic_alokad@quicinc.com, jisoo.jang@yonsei.ac.kr,
petr.tesarik.ext@huawei.com, hdegoede@redhat.com,
keescook@chromium.org, johannes.berg@intel.com, kvalo@kernel.org,
arend.vanspriel@broadcom.com, Duoming Zhou <duoming@zju.edu.cn>
Subject: [PATCH v3] wifi: brcm80211: handle pmk_op allocation failure
Date: Thu, 29 Feb 2024 18:31:53 +0800 [thread overview]
Message-ID: <20240229103153.18533-1-duoming@zju.edu.cn> (raw)
The kzalloc() in brcmf_pmksa_v3_op() will return null if the
physical memory has run out. As a result, if we dereference
the null value, the null pointer dereference bug will happen.
Return -ENOMEM from brcmf_pmksa_v3_op() if kzalloc() fails
for pmk_op.
Fixes: a96202acaea4 ("wifi: brcmfmac: cfg80211: Add support for PMKID_V3 operations")
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
---
Changes in v3:
- Just return -ENOMEM.
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
index 28d6a30cc01..1a5d7494f5e 100644
--- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
+++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
@@ -4322,6 +4322,9 @@ brcmf_pmksa_v3_op(struct brcmf_if *ifp, struct cfg80211_pmksa *pmksa,
int ret;
pmk_op = kzalloc(sizeof(*pmk_op), GFP_KERNEL);
+ if (!pmk_op)
+ return -ENOMEM;
+
pmk_op->version = cpu_to_le16(BRCMF_PMKSA_VER_3);
if (!pmksa) {
--
2.17.1
next reply other threads:[~2024-02-29 10:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-29 10:31 Duoming Zhou [this message]
2024-02-29 11:36 ` [PATCH v3] wifi: brcm80211: handle pmk_op allocation failure Arend van Spriel
2024-03-01 0:40 ` Kees Cook
2024-03-05 18:56 ` Kalle Valo
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=20240229103153.18533-1-duoming@zju.edu.cn \
--to=duoming@zju.edu.cn \
--cc=arend.vanspriel@broadcom.com \
--cc=brcm80211-dev-list.pdl@broadcom.com \
--cc=brcm80211@lists.linux.dev \
--cc=hdegoede@redhat.com \
--cc=jisoo.jang@yonsei.ac.kr \
--cc=johannes.berg@intel.com \
--cc=justinstitt@google.com \
--cc=keescook@chromium.org \
--cc=kvalo@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-wireless@vger.kernel.org \
--cc=petr.tesarik.ext@huawei.com \
--cc=quic_alokad@quicinc.com \
/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