summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorJohn Daley <johndale@cisco.com>2016-07-19 15:42:43 -0700
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-07-22 00:46:16 +0200
commit1ccc51b079c4e36d5701dc1500b2aafa1235858e (patch)
tree08e7dc1538795f7b04a0c6237d57fee2aa59450b /drivers
parent62e82667fd2775c4413c0a575226d84815e2d9b7 (diff)
downloaddpdk-1ccc51b079c4e36d5701dc1500b2aafa1235858e.zip
dpdk-1ccc51b079c4e36d5701dc1500b2aafa1235858e.tar.gz
dpdk-1ccc51b079c4e36d5701dc1500b2aafa1235858e.tar.xz
net/enic: fix possible Rx corruption
Initialize the mbuf data offset to RTE_PKTMBUF_HEADROOM as the enic takes ownership of them. If allocated mbufs had some offset other than RTE_PKTMBUF_HEADROOM, the application would read mbuf data starting at the wrong place and misinterpret the packet. Fixes: 856d7ba7ed22 ("net/enic: support scattered Rx") Reviewed-by: Nelson Escobar <neescoba@cisco.com> Signed-off-by: John Daley <johndale@cisco.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/enic/enic_main.c1
-rw-r--r--drivers/net/enic/enic_rxtx.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/enic/enic_main.c b/drivers/net/enic/enic_main.c
index 542f095..b4ca371 100644
--- a/drivers/net/enic/enic_main.c
+++ b/drivers/net/enic/enic_main.c
@@ -317,6 +317,7 @@ enic_alloc_rx_queue_mbufs(struct enic *enic, struct vnic_rq *rq)
return -ENOMEM;
}
+ mb->data_off = RTE_PKTMBUF_HEADROOM;
dma_addr = (dma_addr_t)(mb->buf_physaddr
+ RTE_PKTMBUF_HEADROOM);
rq_enet_desc_enc(rqd, dma_addr,
diff --git a/drivers/net/enic/enic_rxtx.c b/drivers/net/enic/enic_rxtx.c
index 845a8e6..50f0b28 100644
--- a/drivers/net/enic/enic_rxtx.c
+++ b/drivers/net/enic/enic_rxtx.c
@@ -300,6 +300,7 @@ enic_recv_pkts(void *rx_queue, struct rte_mbuf **rx_pkts,
(struct cq_enet_rq_desc *)&cqd);
/* Push descriptor for newly allocated mbuf */
+ nmb->data_off = RTE_PKTMBUF_HEADROOM;
dma_addr = (dma_addr_t)(nmb->buf_physaddr +
RTE_PKTMBUF_HEADROOM);
rq_enet_desc_enc(rqd_ptr, dma_addr,