This is a note to let you know that I've just added the patch titled
mwifiex: add NULL check for PCIe Rx skb
to the 3.10-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
mwifiex-add-null-check-for-pcie-rx-skb.patch
and it can be found in the queue-3.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.
>From bb8e6a1ee881d131e404f0f1f5e8dc9281002771 Mon Sep 17 00:00:00 2001
From: Amitkumar Karwar <akar...@marvell.com>
Date: Tue, 18 Feb 2014 15:41:55 -0800
Subject: mwifiex: add NULL check for PCIe Rx skb
From: Amitkumar Karwar <akar...@marvell.com>
commit bb8e6a1ee881d131e404f0f1f5e8dc9281002771 upstream.
We may get a NULL pointer here if skb allocation for Rx packet
was failed earlier.
Signed-off-by: Amitkumar Karwar <akar...@marvell.com>
Signed-off-by: Bing Zhao <bz...@marvell.com>
Signed-off-by: John W. Linville <linvi...@tuxdriver.com>
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
drivers/net/wireless/mwifiex/pcie.c | 6 ++++++
1 file changed, 6 insertions(+)
--- a/drivers/net/wireless/mwifiex/pcie.c
+++ b/drivers/net/wireless/mwifiex/pcie.c
@@ -1195,6 +1195,12 @@ static int mwifiex_pcie_process_recv_dat
rd_index = card->rxbd_rdptr & reg->rx_mask;
skb_data = card->rx_buf_list[rd_index];
+ /* If skb allocation was failed earlier for Rx packet,
+ * rx_buf_list[rd_index] would have been left with a NULL.
+ */
+ if (!skb_data)
+ return -ENOMEM;
+
MWIFIEX_SKB_PACB(skb_data, &buf_pa);
pci_unmap_single(card->dev, buf_pa, MWIFIEX_RX_DATA_BUF_SIZE,
PCI_DMA_FROMDEVICE);
Patches currently in stable-queue which might be from akar...@marvell.com are
queue-3.10/mwifiex-add-null-check-for-pcie-rx-skb.patch
queue-3.10/mwifiex-save-and-copy-ap-s-vht-capability-info-correctly.patch
queue-3.10/mwifiex-do-not-advertise-usb-autosuspend-support.patch
queue-3.10/mwifiex-fix-cmd-and-tx-data-timeout-issue-for-pcie-cards.patch
queue-3.10/mwifiex-copy-ap-s-ht-capability-info-correctly.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
