fixes for af_packet driver
cover fixes for af_packet driver
From: Yunjian Wang <[email protected]>
This series include three fixes patches for af_packet driver.
Yunjian Wang (3):
net/af_packet: fix check of file descriptors
net/af_packet: fix mem leak on init failure
net/af_packet: fix wrong munmap on init failure
drivers/net/af_packet/rte_eth_af_packet.c | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-)
Signature · 1 line
1.8.3.1
PATCH 1/3 net/af_packet: fix check of file descriptors
From: Yunjian Wang <[email protected]>
Zero is a valid fd. It will fail to check the fd if the fd is zero.
--- drivers/net/af_packet/rte_eth_af_packet.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/net/af_packet/rte_eth_af_packet.c +3 -1
@@ -645,6 +645,8 @@ struct pmd_internals {for (q =0 ; q < nb_queues; q++) { (*internals)->rx_queue[q].map =MAP_FAILED ; (*internals)->tx_queue[q].map =MAP_FAILED ; + (*internals)->rx_queue[q].sockfd =-1 ; + (*internals)->tx_queue[q].sockfd =-1 ; } req = &((*internals)->req);
@@ -848,7 +850,7 @@ struct pmd_internals {rte_free ((*internals)->rx_queue[q].rd);rte_free ((*internals)->tx_queue[q].rd); -if (((*internals)->rx_queue[q].sockfd !=0 ) && +if (((*internals)->rx_queue[q].sockfd >=0 ) && ((*internals)->rx_queue[q].sockfd != qsockfd))close ((*internals)->rx_queue[q].sockfd); }
Signature · 1 line
1.8.3.1
PATCH 3/3 net/af_packet: fix wrong munmap on init failure
In reply to wangyunjianFrom: Yunjian Wang <[email protected]>
Add a missing available check and fix the wrong address passed to munmap on init failure.
--- drivers/net/af_packet/rte_eth_af_packet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +3 -2
@@ -843,8 +843,9 @@ struct pmd_internals {if (qsockfd !=-1 )close (qsockfd);for (q =0 ; q < nb_queues; q++) { -munmap ((*internals)->rx_queue[q].map, -2 * req->tp_block_size * req->tp_block_nr); +if ((*internals)->rx_queue[q].map !=MAP_FAILED ) +munmap ((*internals)->rx_queue[q].map, +2 * req->tp_block_size * req->tp_block_nr);rte_free ((*internals)->rx_queue[q].rd);rte_free ((*internals)->tx_queue[q].rd);
Signature · 1 line
1.8.3.1
PATCH 2/3 net/af_packet: fix mem leak on init failure
In reply to wangyunjianFrom: Yunjian Wang <[email protected]>
Add missing code to free memory when the device initialization fails.
--- drivers/net/af_packet/rte_eth_af_packet.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
drivers/net/af_packet/rte_eth_af_packet.c +9 -8
@@ -637,9 +637,7 @@ struct pmd_internals {sizeof (struct pkt_tx_queue ), 0, numa_node);if (!(*internals)->rx_queue || !(*internals)->tx_queue) { -rte_free ((*internals)->rx_queue); -rte_free ((*internals)->tx_queue); -return -1 ; + goto free_internals; }for (q =0 ; q < nb_queues; q++) {
@@ -664,20 +662,20 @@ struct pmd_internals {PMD_LOG (ERR ,"%s: I/F name too long (%s)" , name, pair->value); -return -1 ; + goto free_internals; }if (ioctl (sockfd,SIOCGIFINDEX , &ifr) ==-1 ) {PMD_LOG_ERRNO (ERR ,"%s: ioctl failed (SIOCGIFINDEX)" , name); -return -1 ; + goto free_internals; } (*internals)->if_name =strdup (pair->value);if ((*internals)->if_name ==NULL ) -return -1 ; + goto free_internals; (*internals)->if_index = ifr.ifr_ifindex;if (ioctl (sockfd,SIOCGIFHWADDR , &ifr) ==-1 ) {PMD_LOG_ERRNO (ERR ,"%s: ioctl failed (SIOCGIFHWADDR)" , name); -return -1 ; + goto free_internals; }memcpy (&(*internals)->eth_addr, ifr.ifr_hwaddr.sa_data,ETH_ALEN );
@@ -701,7 +699,7 @@ struct pmd_internals {PMD_LOG_ERRNO (ERR ,"%s: could not open AF_PACKET socket" , name); -return -1 ; + goto error; } tpver =TPACKET_V2 ;
@@ -854,6 +852,9 @@ struct pmd_internals { ((*internals)->rx_queue[q].sockfd != qsockfd))close ((*internals)->rx_queue[q].sockfd); } +free_internals: +rte_free ((*internals)->rx_queue); +rte_free ((*internals)->tx_queue);free ((*internals)->if_name);rte_free (*internals);return -1 ;
Signature · 1 line
1.8.3.1
Quoted 9 lines · wangyunjian
From: Yunjian Wang <[email protected]>
This series include three fixes patches for
af_packetdriver.Yunjian Wang (3):
net/af_packet: fix check of file descriptors
net/af_packet: fix mem leak on init failure
net/af_packet: fix wrong munmap on init failure
For series,
Series applied to dpdk-next-net/master, thanks.