wifi: brcm80211: handle pmk_op allocation failure

BugLink: https://bugs.launchpad.net/bugs/2060097

[ 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: a96202acae ("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>
(cherry picked from commit 6138a82f3bccfc67ed7ac059493579fc326c02e5)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

This commit is contained in:

Duoming Zhou

2024-02-29 18:31:53 +08:00

committed by

Roxana Nicolescu

parent 66e5418960

commit ce2f125e6d

1 changed files with 3 additions and 0 deletions

									
										drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c
									
		+3
		
												View 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) {