]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
wifi: brcm80211: handle pmk_op allocation failure
authorDuoming Zhou <duoming@zju.edu.cn>
Thu, 29 Feb 2024 10:31:53 +0000 (18:31 +0800)
committerSasha Levin <sashal@kernel.org>
Tue, 26 Mar 2024 22:16:52 +0000 (18:16 -0400)
[ Upstream commit b4152222e04cb8afeeca239c90e3fcaf4c553b42 ]

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>
Reviewed-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Kalle Valo <kvalo@kernel.org>
Link: https://msgid.link/20240229103153.18533-1-duoming@zju.edu.cn
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

index 28d6a30cc0106d6a38b51e35c1f518accfdbe987..1a5d7494f5e80a0a39aa175a0082304fa8d28938 100644 (file)
@@ -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) {