Commit 2e9f41ac authored Feb 19, 2018 by Thomas Falcon Committed by Greg Kroah-Hartman May 30, 2018

ibmvnic: Check for NULL skb's in NAPI poll routine



[ Upstream commit abe27a885d9e6575e663a16176dabc58ce9d7188 ]

After introduction of commit d0869c0071e4, there were some instances of
RX queue entries from a previous session (before the device was closed
and reopened) returned to the NAPI polling routine. Since the corresponding
socket buffers were freed, this resulted in a panic on reopen. Include
a check for a NULL skb here to avoid this.

Fixes: d0869c0071e4 ("ibmvnic: Clean RX pool buffers during device close")
Signed-off-by: Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 775cc792

drivers/net/ethernet/ibm/ibmvnic.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -1668,6 +1668,11 @@ static int ibmvnic_poll(struct napi_struct *napi, int budget)
		dev_kfree_skb_any(rx_buff->skb);
		remove_buff_from_pool(adapter, rx_buff);
		continue;
		} else if (!rx_buff->skb) {
		/* free the entry */
		next->rx_comp.first = 0;
		remove_buff_from_pool(adapter, rx_buff);
		continue;
		}

		length = be32_to_cpu(next->rx_comp.len);