Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit b811ce9104a7f7663ddae4f7795a194a103b8f90

Authored by Jesse Brandeburg
Committed by David S. Miller
1 parent 5c1e688388
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 1 changed file with 2 additions and 2 deletions Side-by-side Diff

drivers/net/ixgbe/ixgbe_main.c
Diff comments   View file @ b811ce9
... ... @@ -1321,8 +1321,8 @@
1321 1321 if (ring_is_rsc_enabled(rx_ring))
1322 1322 pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
1323 1323  
1324   - /* if this is a skb from previous receive DMA will be 0 */
1325   - if (rx_buffer_info->dma) {
  1324 + /* linear means we are building an skb from multiple pages */
  1325 + if (!skb_is_nonlinear(skb)) {
1326 1326 u16 hlen;
1327 1327 if (pkt_is_rsc &&
1328 1328 !(staterr & IXGBE_RXD_STAT_EOP) &&