]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
wifi: wcn36xx: fix channel survey memory allocation size
authorBarnabás Czémán <barnabas.czeman@mainlining.org>
Mon, 4 Nov 2024 20:00:35 +0000 (21:00 +0100)
committerJeff Johnson <quic_jjohnson@quicinc.com>
Thu, 21 Nov 2024 15:52:49 +0000 (07:52 -0800)
KASAN reported a memory allocation issue in wcn->chan_survey
due to incorrect size calculation.
This commit uses kcalloc to allocate memory for wcn->chan_survey,
ensuring proper initialization and preventing the use of uninitialized
values when there are no frames on the channel.

Fixes: 29696e0aa413 ("wcn36xx: Track SNR and RSSI for each RX frame")
Signed-off-by: Barnabás Czémán <barnabas.czeman@mainlining.org>
Acked-by: Loic Poulain <loic.poulain@linaro.org>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Link: https://patch.msgid.link/20241104-wcn36xx-memory-allocation-v1-1-5ec901cf37b6@mainlining.org
Signed-off-by: Jeff Johnson <quic_jjohnson@quicinc.com>
drivers/net/wireless/ath/wcn36xx/main.c

index 408776562a7e56da3017aa074396bcd241d62f8c..cd36cab6db75d300f4f6617a6a9e1550f62921c7 100644 (file)
@@ -1590,7 +1590,10 @@ static int wcn36xx_probe(struct platform_device *pdev)
        }
 
        n_channels = wcn_band_2ghz.n_channels + wcn_band_5ghz.n_channels;
-       wcn->chan_survey = devm_kmalloc(wcn->dev, n_channels, GFP_KERNEL);
+       wcn->chan_survey = devm_kcalloc(wcn->dev,
+                                       n_channels,
+                                       sizeof(struct wcn36xx_chan_survey),
+                                       GFP_KERNEL);
        if (!wcn->chan_survey) {
                ret = -ENOMEM;
                goto out_wq;