* [net] ixgbe: fix possible null buffer error
@ 2011-09-21 1:13 Jeff Kirsher
2011-09-21 6:16 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Jeff Kirsher @ 2011-09-21 1:13 UTC (permalink / raw)
To: davem
Cc: Jesse Brandeburg, netdev, gospo, Alexander Duyck, stable,
Jeff Kirsher
From: Jesse Brandeburg <jesse.brandeburg@intel.com>
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>
---
drivers/net/ixgbe/ixgbe_main.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ixgbe/ixgbe_main.c b/drivers/net/ixgbe/ixgbe_main.c
index 2279039..e1fcc95 100644
--- a/drivers/net/ixgbe/ixgbe_main.c
+++ b/drivers/net/ixgbe/ixgbe_main.c
@@ -1321,8 +1321,8 @@ static void ixgbe_clean_rx_irq(struct ixgbe_q_vector *q_vector,
if (ring_is_rsc_enabled(rx_ring))
pkt_is_rsc = ixgbe_get_rsc_state(rx_desc);
- /* if this is a skb from previous receive DMA will be 0 */
- if (rx_buffer_info->dma) {
+ /* linear means we are building an skb from multiple pages */
+ if (!skb_is_nonlinear(skb)) {
u16 hlen;
if (pkt_is_rsc &&
!(staterr & IXGBE_RXD_STAT_EOP) &&
--
1.7.6.2
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [net] ixgbe: fix possible null buffer error
2011-09-21 1:13 [net] ixgbe: fix possible null buffer error Jeff Kirsher
@ 2011-09-21 6:16 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-09-21 6:16 UTC (permalink / raw)
To: jeffrey.t.kirsher
Cc: jesse.brandeburg, netdev, gospo, alexander.h.duyck, stable
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Tue, 20 Sep 2011 18:13:03 -0700
> From: Jesse Brandeburg <jesse.brandeburg@intel.com>
>
> 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>
Applied.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-09-21 6:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-21 1:13 [net] ixgbe: fix possible null buffer error Jeff Kirsher
2011-09-21 6:16 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).