Skip to content

Commit b811ce9

Browse files
jbrandebdavem330
authored andcommitted
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>
1 parent 5c1e688 commit b811ce9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/net/ixgbe/ixgbe_main.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1321,8 +1321,8 @@ static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
13211321
if (ring_is_rsc_enabled(rx_ring))
13221322
pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
13231323

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)) {
13261326
u16 hlen;
13271327
if (pkt_is_rsc &&
13281328
!(staterr & IXGBE_RXD_STAT_EOP) &&

0 commit comments

Comments
 (0)