eventdev/eth_tx: fix queue_del function

Message ID 20211109073334.3910034-1-s.v.naga.harish.k@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Jerin Jacob
Headers
Series eventdev/eth_tx: fix queue_del function |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-broadcom-Functional success Functional Testing PASS
ci/github-robot: build success github build: passed
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-broadcom-Performance success Performance Testing PASS
ci/iol-aarch64-unit-testing success Testing PASS
ci/iol-aarch64-compile-testing success Testing PASS
ci/iol-x86_64-compile-testing success Testing PASS
ci/iol-x86_64-unit-testing fail Testing issues
ci/iol-intel-Functional success Functional Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Testing success Testing PASS
ci/iol-intel-Performance success Performance Testing PASS

Commit Message

Naga Harish K, S V Nov. 9, 2021, 7:33 a.m. UTC
  This patch fixes heap-use-after-free reported by ASAN,
please reference https://bugs.dpdk.org/show_bug.cgi?id=869

The application can use the queue_id as `-1` to delete all
the queues of the eth_device that are added to tx_adapter
instance.
In above case, the queue_del api is trying to use number of
queues from adapter level instead of eth_device queues.
When there are queues added from multiple eth devices,
it will result in heap-use-after-free as reported by ASAN.

This patch fixes the queue_del api to use correct number of
queues.

Bugzilla ID: 869
Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
Cc: stable@dpdk.org

Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
---
 lib/eventdev/rte_event_eth_tx_adapter.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Jayatheerthan, Jay Nov. 9, 2021, 9:24 a.m. UTC | #1
+ David Marchand, who reported this issue.

The change looks good to me. You can add my ack.

> -----Original Message-----
> From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> Sent: Tuesday, November 9, 2021 1:04 PM
> To: jerinj@marvell.com; Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> Cc: dev@dpdk.org; stable@dpdk.org
> Subject: [PATCH] eventdev/eth_tx: fix queue_del function
> 
> This patch fixes heap-use-after-free reported by ASAN,
> please reference https://bugs.dpdk.org/show_bug.cgi?id=869
> 
> The application can use the queue_id as `-1` to delete all
> the queues of the eth_device that are added to tx_adapter
> instance.
> In above case, the queue_del api is trying to use number of
> queues from adapter level instead of eth_device queues.
> When there are queues added from multiple eth devices,
> it will result in heap-use-after-free as reported by ASAN.
> 
> This patch fixes the queue_del api to use correct number of
> queues.
> 
> Bugzilla ID: 869
> Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
> Cc: stable@dpdk.org
> 
> Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>
> ---
>  lib/eventdev/rte_event_eth_tx_adapter.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
> index da55d2c2dc..c17f33f098 100644
> --- a/lib/eventdev/rte_event_eth_tx_adapter.c
> +++ b/lib/eventdev/rte_event_eth_tx_adapter.c
> @@ -864,7 +864,7 @@ txa_service_queue_del(uint8_t id,
>  		uint16_t i, q, nb_queues;
>  		int ret = 0;
> 
> -		nb_queues = txa->nb_queues;
> +		nb_queues = txa->txa_ethdev[port_id].nb_queues;
>  		if (nb_queues == 0)
>  			return 0;
> 
> --
> 2.25.1
  
David Marchand Nov. 9, 2021, 9:54 a.m. UTC | #2
On Tue, Nov 9, 2021 at 10:24 AM Jayatheerthan, Jay
<jay.jayatheerthan@intel.com> wrote:
> > -----Original Message-----
> > From: Naga Harish K, S V <s.v.naga.harish.k@intel.com>
> > Sent: Tuesday, November 9, 2021 1:04 PM
> > To: jerinj@marvell.com; Jayatheerthan, Jay <jay.jayatheerthan@intel.com>
> > Cc: dev@dpdk.org; stable@dpdk.org
> > Subject: [PATCH] eventdev/eth_tx: fix queue_del function
> >
> > This patch fixes heap-use-after-free reported by ASAN,
> > please reference https://bugs.dpdk.org/show_bug.cgi?id=869
> >
> > The application can use the queue_id as `-1` to delete all
> > the queues of the eth_device that are added to tx_adapter
> > instance.
> > In above case, the queue_del api is trying to use number of
> > queues from adapter level instead of eth_device queues.
> > When there are queues added from multiple eth devices,
> > it will result in heap-use-after-free as reported by ASAN.
> >
> > This patch fixes the queue_del api to use correct number of
> > queues.
> >
> > Bugzilla ID: 869
> > Fixes: a3bbf2e09756 ("eventdev: add eth Tx adapter implementation")
> > Cc: stable@dpdk.org
> >
> > Signed-off-by: Naga Harish K S V <s.v.naga.harish.k@intel.com>

RTE>>event_eth_tx_adapter_autotest
 + ------------------------------------------------------- +
 + Test Suite : tx event eth adapter test suite
Port 0 MAC: 00 00 00 00 00 00
Port 1 MAC: 00 00 00 00 00 00
Failed to find a valid event device, testing with event_sw0 device
 + ------------------------------------------------------- +
 + TestCase [ 0] : tx_adapter_create_free succeeded
Invalid port_id=2
EVENTDEV: txa_service_adapter_free() line 743: 1 Tx queues not deleted
 + TestCase [ 1] : tx_adapter_queue_add_del succeeded
 + TestCase [ 2] : tx_adapter_start_stop succeeded
 + TestCase [ 3] : tx_adapter_service succeeded
 + TestCase [ 4] : tx_adapter_dynamic_device succeeded
 + ------------------------------------------------------- +
 + Test Suite Summary : tx event eth adapter test suite
 + ------------------------------------------------------- +
 + Tests Total :        5
 + Tests Skipped :      0
 + Tests Executed :     5
 + Tests Unsupported:   0
 + Tests Passed :       5
 + Tests Failed :       0
 + ------------------------------------------------------- +
Test OK

And no ASan splat.
Tested-by: David Marchand <david.marchand@redhat.com>

Thanks.
  

Patch

diff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c
index da55d2c2dc..c17f33f098 100644
--- a/lib/eventdev/rte_event_eth_tx_adapter.c
+++ b/lib/eventdev/rte_event_eth_tx_adapter.c
@@ -864,7 +864,7 @@  txa_service_queue_del(uint8_t id,
 		uint16_t i, q, nb_queues;
 		int ret = 0;
 
-		nb_queues = txa->nb_queues;
+		nb_queues = txa->txa_ethdev[port_id].nb_queues;
 		if (nb_queues == 0)
 			return 0;