pcap: fix Rx crash
authorPablo de Lara <pablo.de.lara.guarch@intel.com>
Tue, 5 Aug 2014 10:18:20 +0000 (11:18 +0100)
committerThomas Monjalon <thomas.monjalon@6wind.com>
Tue, 12 Aug 2014 23:27:53 +0000 (01:27 +0200)
Normally, bufs[i] stores the mbuf pointer, the index of buf[i]
is the loop count i, but if header.len > buf_size, DPDK will
free the mbuf, but the loop count i still increases, so some
of the items in bufs[] might be NULL pointer, causing a potential
DPDK core. Using num_rx as the index for bufs[] solves the problem.

Signed-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>
Tested-by: Jiajia SunX <sunx.jiajia@intel.com>
Acked-by: Thomas Monjalon <thomas.monjalon@6wind.com>
lib/librte_pmd_pcap/rte_eth_pcap.c

index c77ee25..eebe768 100644 (file)
@@ -154,7 +154,7 @@ eth_pcap_rx(void *queue,
                        rte_memcpy(mbuf->pkt.data, packet, header.len);
                        mbuf->pkt.data_len = (uint16_t)header.len;
                        mbuf->pkt.pkt_len = mbuf->pkt.data_len;
-                       bufs[i] = mbuf;
+                       bufs[num_rx] = mbuf;
                        num_rx++;
                } else {
                        /* pcap packet will not fit in the mbuf, so drop packet */