Commit 07d69832 authored by Petr Tesarik's avatar Petr Tesarik Committed by Johannes Berg
Browse files

wifi: brcm80211: handle params_v1 allocation failure 



Return -ENOMEM from brcmf_run_escan() if kzalloc() fails for v1 params.

Fixes: 398ce273 ("wifi: brcmfmac: cfg80211: Add support for scan params v2")
Signed-off-by: default avatarPetr Tesarik <petr.tesarik.ext@huawei.com>
Link: https://lore.kernel.org/r/20230802163430.1656-1-petrtesarik@huaweicloud.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 16e455a4

drivers/net/wireless/broadcom/brcm80211/brcmfmac/cfg80211.c

+5 −0
Original line number Diff line number Diff line
@@ -1456,6 +1456,10 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp, 
		params_size -= BRCMF_SCAN_PARAMS_V2_FIXED_SIZE;

		params_size += BRCMF_SCAN_PARAMS_FIXED_SIZE;

		params_v1 = kzalloc(params_size, GFP_KERNEL);

		if (!params_v1) {

			err = -ENOMEM;

			goto exit_params;

		}

		params_v1->version = cpu_to_le32(BRCMF_ESCAN_REQ_VERSION);

		brcmf_scan_params_v2_to_v1(&params->params_v2_le, &params_v1->params_le);

		kfree(params);
@@ -1473,6 +1477,7 @@ brcmf_run_escan(struct brcmf_cfg80211_info *cfg, struct brcmf_if *ifp, 
			bphy_err(drvr, "error (%d)\n", err);

	}



exit_params:

	kfree(params);

exit:

	return err;