* [PATCH v2] mwifiex: correctly handling kzalloc
@ 2015-12-30 16:01 Insu Yun
2016-01-07 9:12 ` [v2] " Kalle Valo
0 siblings, 1 reply; 2+ messages in thread
From: Insu Yun @ 2015-12-30 16:01 UTC (permalink / raw)
To: akarwar, nishants, kvalo, linux-wireless, netdev, linux-kernel
Cc: taesoo, yeongjin.jang, insu, changwoo, Insu Yun
Since kzalloc can be failed in memory pressure,
it needs to be handled, otherwise NULL dereference could be happened
Signed-off-by: Insu Yun <wuninsu@gmail.com>
---
drivers/net/wireless/mwifiex/sdio.c | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/drivers/net/wireless/mwifiex/sdio.c b/drivers/net/wireless/mwifiex/sdio.c
index 78a8474..a8af72d 100644
--- a/drivers/net/wireless/mwifiex/sdio.c
+++ b/drivers/net/wireless/mwifiex/sdio.c
@@ -2053,8 +2053,19 @@ static int mwifiex_init_sdio(struct mwifiex_adapter *adapter)
/* Allocate skb pointer buffers */
card->mpa_rx.skb_arr = kzalloc((sizeof(void *)) *
card->mp_agg_pkt_limit, GFP_KERNEL);
+ if (!card->mpa_rx.skb_arr) {
+ kfree(card->mp_regs);
+ return -ENOMEM;
+ }
+
card->mpa_rx.len_arr = kzalloc(sizeof(*card->mpa_rx.len_arr) *
card->mp_agg_pkt_limit, GFP_KERNEL);
+ if (!card->mpa_rx.len_arr) {
+ kfree(card->mp_regs);
+ kfree(card->mpa_rx.skb_arr);
+ return -ENOMEM;
+ }
+
ret = mwifiex_alloc_sdio_mpa_buffers(adapter,
card->mp_tx_agg_buf_size,
card->mp_rx_agg_buf_size);
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [v2] mwifiex: correctly handling kzalloc
2015-12-30 16:01 [PATCH v2] mwifiex: correctly handling kzalloc Insu Yun
@ 2016-01-07 9:12 ` Kalle Valo
0 siblings, 0 replies; 2+ messages in thread
From: Kalle Valo @ 2016-01-07 9:12 UTC (permalink / raw)
To: Insu Yun
Cc: akarwar, nishants, linux-wireless, netdev, linux-kernel, taesoo,
yeongjin.jang, insu, changwoo, Insu Yun
> Since kzalloc can be failed in memory pressure,
> it needs to be handled, otherwise NULL dereference could be happened
>
> Signed-off-by: Insu Yun <wuninsu@gmail.com>
Thanks, applied to wireless-drivers-next.git.
Kalle Valo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-01-07 9:13 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-12-30 16:01 [PATCH v2] mwifiex: correctly handling kzalloc Insu Yun
2016-01-07 9:12 ` [v2] " Kalle Valo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).