aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Chang <rchang@ti.com>2018-01-16 15:16:01 -0500
committerDavid S. Miller <davem@davemloft.net>2018-01-17 16:19:37 -0500
commit5a717843177c96ca3fe4565187de395afdb28092 (patch)
tree8e4e6770752f4506041512037d132f423b0da0b3
parent6db959c82eb039a151d95a0f8b7dea643657327a (diff)
downloadlinux-4.1-5a717843177c96ca3fe4565187de395afdb28092.tar.gz
Net: ethernet: ti: netcp: Fix inbound ping crash if MTU size is greater than 1500
In the receive queue for 4096 bytes fragments, the page address set in the SW data0 field of the descriptor is not the one we got when doing the reassembly in receive. The page structure was retrieved from the wrong descriptor into SW data0 which is then causing a page fault when UDP checksum is accessing data above 1500. Signed-off-by: Rex Chang <rchang@ti.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/ti/netcp_core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/ethernet/ti/netcp_core.c b/drivers/net/ethernet/ti/netcp_core.c
index ed58c746e4af19..f5a7eb22d0f50e 100644
--- a/drivers/net/ethernet/ti/netcp_core.c
+++ b/drivers/net/ethernet/ti/netcp_core.c
@@ -715,7 +715,7 @@ static int netcp_process_one_rx_packet(struct netcp_intf *netcp)
/* warning!!!! We are retrieving the virtual ptr in the sw_data
* field as a 32bit value. Will not work on 64bit machines
*/
- page = (struct page *)GET_SW_DATA0(desc);
+ page = (struct page *)GET_SW_DATA0(ndesc);
if (likely(dma_buff && buf_len && page)) {
dma_unmap_page(netcp->dev, dma_buff, PAGE_SIZE,