* [dpdk-dev] [PATCH] net/af_packet: fix fd use after free
@ 2017-01-05 14:33 Timmons C. Player
2017-01-09 11:55 ` Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Timmons C. Player @ 2017-01-05 14:33 UTC (permalink / raw)
To: linville; +Cc: dev, Timmons C. Player
When using the same file descriptor for both rx and tx, the
eth_dev_stop function would close the same fd twice. This
change prevents that from happening.
Signed-off-by: Timmons C. Player <timmons.player@spirent.com>
---
drivers/net/af_packet/rte_eth_af_packet.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
index 2951f86..c44b8b9 100644
--- a/drivers/net/af_packet/rte_eth_af_packet.c
+++ b/drivers/net/af_packet/rte_eth_af_packet.c
@@ -261,9 +261,16 @@ eth_dev_stop(struct rte_eth_dev *dev)
sockfd = internals->rx_queue[i].sockfd;
if (sockfd != -1)
close(sockfd);
- sockfd = internals->tx_queue[i].sockfd;
- if (sockfd != -1)
- close(sockfd);
+
+ /* Prevent use after free in case tx fd == rx fd */
+ if (sockfd != internals->tx_queue[i].sockfd) {
+ sockfd = internals->tx_queue[i].sockfd;
+ if (sockfd != -1)
+ close(sockfd);
+ }
+
+ internals->rx_queue[i].sockfd = -1;
+ internals->tx_queue[i].sockfd = -1;
}
dev->data->dev_link.link_status = ETH_LINK_DOWN;
--
2.7.4
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [PATCH] net/af_packet: fix fd use after free
2017-01-05 14:33 [dpdk-dev] [PATCH] net/af_packet: fix fd use after free Timmons C. Player
@ 2017-01-09 11:55 ` Ferruh Yigit
2017-01-09 12:04 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
0 siblings, 1 reply; 3+ messages in thread
From: Ferruh Yigit @ 2017-01-09 11:55 UTC (permalink / raw)
To: Timmons C. Player, linville; +Cc: dev, dpdk stable
On 1/5/2017 2:33 PM, Timmons C. Player wrote:
> When using the same file descriptor for both rx and tx, the
> eth_dev_stop function would close the same fd twice. This
> change prevents that from happening.
>
> Signed-off-by: Timmons C. Player <timmons.player@spirent.com>
Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual
devices")
CC:stable@dpdk.org
Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [dpdk-dev] [dpdk-stable] [PATCH] net/af_packet: fix fd use after free
2017-01-09 11:55 ` Ferruh Yigit
@ 2017-01-09 12:04 ` Ferruh Yigit
0 siblings, 0 replies; 3+ messages in thread
From: Ferruh Yigit @ 2017-01-09 12:04 UTC (permalink / raw)
To: Timmons C. Player, linville; +Cc: dev, dpdk stable
On 1/9/2017 11:55 AM, Ferruh Yigit wrote:
> On 1/5/2017 2:33 PM, Timmons C. Player wrote:
>> When using the same file descriptor for both rx and tx, the
>> eth_dev_stop function would close the same fd twice. This
>> change prevents that from happening.
>>
>> Signed-off-by: Timmons C. Player <timmons.player@spirent.com>
>
> Fixes: 364e08f2bbc0 ("af_packet: add PMD for AF_PACKET-based virtual
> devices")
>
> CC:stable@dpdk.org
>
> Acked-by: Ferruh Yigit <ferruh.yigit@intel.com>
>
Applied to dpdk-next-net/master, thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-01-09 12:04 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-01-05 14:33 [dpdk-dev] [PATCH] net/af_packet: fix fd use after free Timmons C. Player
2017-01-09 11:55 ` Ferruh Yigit
2017-01-09 12:04 ` [dpdk-dev] [dpdk-stable] " Ferruh Yigit
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).