[PATCH v4] app/pdump: check lcore is not the maximum core

[Mcnamara, John]

Thomas, could you include this in RC3 if possible.

> -----Original Message-----
> From: Reshma Pattan <reshma.pattan at intel.com>
> Sent: Monday, February 28, 2022 9:59 AM
> To: dev at dpdk.org
> Cc: stephen at networkplumber.org; Yigit, Ferruh <ferruh.yigit at intel.com>;
> Pattan, Reshma <reshma.pattan at intel.com>; vipin.varghese at intel.com;
> stable at dpdk.org
> Subject: [PATCH v4] app/pdump: check lcore is not the maximum core
> 
> Check lcore id value is not the maximum core supported.
> Using lcore id without this check might cause out of bound access inside
> the rte_eal_wait_lcore.
> 
> Coverity issue: 375841
> Fixes: b2854d5317e8 ("app/pdump: support multi-core capture")
> Cc: vipin.varghese at intel.com
> Cc: stable at dpdk.org
> 
> Signed-off-by: Reshma Pattan <reshma.pattan at intel.com>
> ---
> v4: Remove inline of new function
>     Change lcore type as unsigned int
>     return lcore from the function
> ---
>  app/pdump/main.c | 16 +++++++++++++---
>  1 file changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/app/pdump/main.c b/app/pdump/main.c index
> 04a38e8911..96fa76f8da 100644
> --- a/app/pdump/main.c
> +++ b/app/pdump/main.c
> @@ -900,11 +900,21 @@ dump_packets_core(void *arg)
>  	return 0;
>  }
> 
> +static unsigned int
> +get_next_core(unsigned int lcore)
> +{
> +	lcore = rte_get_next_lcore(lcore, 1, 0);
> +	if (lcore == RTE_MAX_LCORE)
> +		rte_exit(EXIT_FAILURE,
> +				"Max core limit %u reached for packet capture",
> lcore);
> +	return lcore;
> +}
> +
>  static inline void
>  dump_packets(void)
>  {
>  	int i;
> -	uint32_t lcore_id = 0;
> +	unsigned int lcore_id = 0;
> 
>  	if (!multiple_core_capture) {
>  		printf(" core (%u), capture for (%d) tuples\n", @@ -930,12
> +940,12 @@ dump_packets(void)
>  		return;
>  	}
> 
> -	lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
> +	lcore_id = get_next_core(lcore_id);
> 
>  	for (i = 0; i < num_tuples; i++) {
>  		rte_eal_remote_launch(dump_packets_core,
>  				&pdump_t[i], lcore_id);
> -		lcore_id = rte_get_next_lcore(lcore_id, 1, 0);
> +		lcore_id = get_next_core(lcore_id);
> 
>  		if (rte_eal_wait_lcore(lcore_id) < 0)
>  			rte_exit(EXIT_FAILURE, "failed to wait\n");
> --
> 2.25.1