ixgbe: fix crash in build_skb Rx code path
Subsystems (2)
PATCH 1/1 ixgbe: fix crash in build_skb Rx code path
Add check for build_skb enabled ring in ixgbe_dma_sync_frag(). In that case &skb_shinfo(skb)->frags[0] may not always be set which can lead to a crash. Instead we derive the page offset from skb->data.
("ixgbe: Have the CPU take ownership of the buffers sooner")
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +8 -0
@@ -1888,6 +1888,14 @@ static void ixgbe_dma_sync_frag(struct ixgbe_ring *rx_ring,ixgbe_rx_pg_size (rx_ring),DMA_FROM_DEVICE , IXGBE_RX_DMA_ATTR); + }else if (ring_uses_build_skb (rx_ring)) { +unsigned long offset = (unsigned long )(skb->data) & ~PAGE_MASK ; + +dma_sync_single_range_for_cpu (rx_ring->dev, +IXGBE_CB (skb)->dma, + offset, +skb_headlen (skb), +DMA_FROM_DEVICE ); }else {struct skb_frag_struct *frag = &skb_shinfo (skb)->frags[0 ];
Bowers
PATCH 1/1 ixgbe: fix crash in build_skb Rx code path
Quoted 11 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at osuosl.org] On Behalf Of Emil Tantilov
Sent: Wednesday, February 7, 2018 2:23 PM
To: intel-wired-lan at lists.osuosl.org
Subject: [Intel-wired-lan] [PATCH] ixgbe: fix crash inbuild_skbRx code pathAdd check for
build_skbenabled ring inixgbe_dma_sync_frag(). In that case &skb_shinfo(skb)->frags[0] may not always be set which can lead to a crash. Instead we derive the page offset fromskb->data.
Quoted 8 lines
Fixes 42073d91a214("ixgbe: Have the CPU take ownership of the buffers sooner")
Reported-by Ambarish Soman <[email protected]>Suggested-by Alexander Duyck <[email protected]>Signed-off-by Emil Tantilov <[email protected]>--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 8 ++++++++ 1 file changed, 8 insertions(+)