| Message ID | 20241104-wcn36xx-memory-allocation-v1-1-5ec901cf37b6@mainlining.org (mailing list archive) |
|---|---|
| State | Under Review |
| Delegated to: | Jeff Johnson |
| Headers | show |
| Series | wifi: wcn36xx: fix channel survey memory allocation size | expand |
On 04/11/2024 20:00, Barnabás Czémán wrote: > 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> > --- > drivers/net/wireless/ath/wcn36xx/main.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c > index 408776562a7e56da3017aa074396bcd241d62f8c..cd36cab6db75d300f4f6617a6a9e1550f62921c7 100644 > --- a/drivers/net/wireless/ath/wcn36xx/main.c > +++ b/drivers/net/wireless/ath/wcn36xx/main.c > @@ -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; > > --- > base-commit: 1ffec08567f426a1c593e038cadc61bdc38cb467 > change-id: 20241104-wcn36xx-memory-allocation-803e4e3de9a6 > > Best regards, Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
On Mon, 4 Nov 2024 at 21:00, Barnabás Czémán <barnabas.czeman@mainlining.org> wrote: > > 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>
diff --git a/drivers/net/wireless/ath/wcn36xx/main.c b/drivers/net/wireless/ath/wcn36xx/main.c index 408776562a7e56da3017aa074396bcd241d62f8c..cd36cab6db75d300f4f6617a6a9e1550f62921c7 100644 --- a/drivers/net/wireless/ath/wcn36xx/main.c +++ b/drivers/net/wireless/ath/wcn36xx/main.c @@ -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;
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> --- drivers/net/wireless/ath/wcn36xx/main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) --- base-commit: 1ffec08567f426a1c593e038cadc61bdc38cb467 change-id: 20241104-wcn36xx-memory-allocation-803e4e3de9a6 Best regards,