* [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure
@ 2024-02-28 6:34 Duoming Zhou
2024-02-28 12:54 ` Arend van Spriel
2024-02-28 14:48 ` Kees Cook
0 siblings, 2 replies; 4+ messages in thread
From: Duoming Zhou @ 2024-02-28 6:34 UTC (permalink / raw)
To: linux-kernel
Cc: brcm80211-dev-list.pdl, brcm80211, linux-wireless, justinstitt,
jisoo.jang, petr.tesarik.ext, quic_alokad, hdegoede, keescook,
johannes.berg, kvalo, arend.vanspriel, Duoming Zhou
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")
Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
---
Changes in v2:
- Drop the new label and 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..7af6d6448b9 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)
+ ret = -ENOMEM;
+
pmk_op->version = cpu_to_le16(BRCMF_PMKSA_VER_3);
if (!pmksa) {
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure
2024-02-28 6:34 [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure Duoming Zhou
@ 2024-02-28 12:54 ` Arend van Spriel
2024-02-28 14:48 ` Kees Cook
1 sibling, 0 replies; 4+ messages in thread
From: Arend van Spriel @ 2024-02-28 12:54 UTC (permalink / raw)
To: Duoming Zhou, linux-kernel
Cc: brcm80211-dev-list.pdl, brcm80211, linux-wireless, justinstitt,
jisoo.jang, petr.tesarik.ext, quic_alokad, hdegoede, keescook,
johannes.berg, kvalo
[-- Attachment #1: Type: text/plain, Size: 704 bytes --]
On 2/28/2024 7:34 AM, Duoming Zhou wrote:
> 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")
Thanks!
Acked-by: Arend van Spriel <arend.vanspriel@broadcom.com>
> Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
> ---
> Changes in v2:
> - Drop the new label and just return -ENOMEM.
>
> drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c | 3 +++
> 1 file changed, 3 insertions(+)
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure
2024-02-28 6:34 [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure Duoming Zhou
2024-02-28 12:54 ` Arend van Spriel
@ 2024-02-28 14:48 ` Kees Cook
2024-02-28 15:46 ` Arend Van Spriel
1 sibling, 1 reply; 4+ messages in thread
From: Kees Cook @ 2024-02-28 14:48 UTC (permalink / raw)
To: Duoming Zhou, linux-kernel
Cc: brcm80211-dev-list.pdl, brcm80211, linux-wireless, justinstitt,
jisoo.jang, petr.tesarik.ext, quic_alokad, hdegoede, keescook,
johannes.berg, kvalo, arend.vanspriel
On February 27, 2024 10:34:08 PM PST, Duoming Zhou <duoming@zju.edu.cn> wrote:
>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")
>Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
>---
>Changes in v2:
> - Drop the new label and 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..7af6d6448b9 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)
>+ ret = -ENOMEM;
This doesn't fix anything. It doesn't stop the execution path; it'll continue and immediately dereference the NULL pmk_op in the next line...
>+
> pmk_op->version = cpu_to_le16(BRCMF_PMKSA_VER_3);
>
> if (!pmksa) {
--
Kees Cook
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure
2024-02-28 14:48 ` Kees Cook
@ 2024-02-28 15:46 ` Arend Van Spriel
0 siblings, 0 replies; 4+ messages in thread
From: Arend Van Spriel @ 2024-02-28 15:46 UTC (permalink / raw)
To: Kees Cook, Duoming Zhou, linux-kernel
Cc: brcm80211-dev-list.pdl, brcm80211, linux-wireless, justinstitt,
jisoo.jang, petr.tesarik.ext, quic_alokad, hdegoede, keescook,
johannes.berg, kvalo
[-- Attachment #1: Type: text/plain, Size: 1647 bytes --]
On February 28, 2024 3:48:18 PM Kees Cook <kees@kernel.org> wrote:
> On February 27, 2024 10:34:08 PM PST, Duoming Zhou <duoming@zju.edu.cn> wrote:
>> 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")
>> Signed-off-by: Duoming Zhou <duoming@zju.edu.cn>
>> ---
>> Changes in v2:
>> - Drop the new label and 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..7af6d6448b9 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)
>> + ret = -ENOMEM;
>
> This doesn't fix anything. It doesn't stop the execution path; it'll
> continue and immediately dereference the NULL pmk_op in the next line...
Crap. Do I look bad :-( Thanks for catching my blunder. I was seeing what I
wanted to see I guess.
Regards,
Arend
>
>> +
>> pmk_op->version = cpu_to_le16(BRCMF_PMKSA_VER_3);
>>
>> if (!pmksa) {
>
> --
> Kees Cook
[-- Attachment #2: S/MIME Cryptographic Signature --]
[-- Type: application/pkcs7-signature, Size: 4219 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-02-28 15:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-28 6:34 [PATCH v2] wifi: brcm80211: handle pmk_op allocation failure Duoming Zhou
2024-02-28 12:54 ` Arend van Spriel
2024-02-28 14:48 ` Kees Cook
2024-02-28 15:46 ` Arend Van Spriel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).