mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
ixgbe: fix possible null buffer error
It seems that at least one PPC machine would occasionally give a (valid) 0 as the return value from dma_map, this caused the ixgbe code to not work correctly. A fix is pending in the PPC tree to not return 0 from dma map, but we can also fix the driver to make sure we don't mess up in other arches as well. This patch is applicable to all current stable kernels. Ref: https://bugzilla.redhat.com/show_bug.cgi?id=683611 Reported-by: Neil Horman <nhorman@redhat.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> CC: Alexander Duyck <alexander.h.duyck@intel.com> CC: stable@kernel.org Tested-by: Thadeu Lima de Souza Cascardo <cascardo@linux.vnet.ibm.com> Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
5c1e688388
commit
b811ce9104
1 changed files with 2 additions and 2 deletions
|
@ -1321,8 +1321,8 @@ static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
|
||||||
if (ring_is_rsc_enabled(rx_ring))
|
if (ring_is_rsc_enabled(rx_ring))
|
||||||
pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
|
pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
|
||||||
|
|
||||||
/* if this is a skb from previous receive DMA will be 0 */
|
/* linear means we are building an skb from multiple pages */
|
||||||
if (rx_buffer_info->dma) {
|
if (!skb_is_nonlinear(skb)) {
|
||||||
u16 hlen;
|
u16 hlen;
|
||||||
if (pkt_is_rsc &&
|
if (pkt_is_rsc &&
|
||||||
!(staterr & IXGBE_RXD_STAT_EOP) &&
|
!(staterr & IXGBE_RXD_STAT_EOP) &&
|
||||||
|
|
Loading…
Reference in a new issue