d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

net/af_packet: guard against buffer overruns in Rx path

Browse Source 
Signed-off-by: Michał Mirosław <michal.miroslaw@atendesoftware.pl>
Acked-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Michał Mirosław 2016-12-13 02:28:34 +01:00 committed by Ferruh Yigit
parent c4fdcb6aed
commit b5a8868bde
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/af_packet/rte_eth_af_packet.c
View File

@ -366,18 +366,20 @@ eth_rx_queue_setup(struct rte_eth_dev *dev,
{
struct pmd_internals *internals = dev->data->dev_private;
struct pkt_rx_queue *pkt_q = &internals->rx_queue[rx_queue_id];
uint16_t buf_size;
unsigned int buf_size, data_size;
pkt_q->mb_pool = mb_pool;
/* Now get the space available for data in the mbuf */
buf_size = (uint16_t)(rte_pktmbuf_data_room_size(pkt_q->mb_pool) -
RTE_PKTMBUF_HEADROOM);
buf_size = rte_pktmbuf_data_room_size(pkt_q->mb_pool) -
RTE_PKTMBUF_HEADROOM;
data_size = internals->req.tp_frame_size;
data_size -= TPACKET2_HDRLEN - sizeof(struct sockaddr_ll);
if (ETH_FRAME_LEN > buf_size) {
if (data_size > buf_size) {
RTE_LOG(ERR, PMD,
"%s: %d bytes will not fit in mbuf (%d bytes)\n",
dev->data->name, ETH_FRAME_LEN, buf_size);
dev->data->name, data_size, buf_size);
return -ENOMEM;
}