[RESEND,v2,01/11] ethdev: check return result of rte_eth_dev_info_get

Message ID 20221122153053.1172434-2-okaya@kernel.org (mailing list archive)
State Changes Requested, archived
Delegated to: Ferruh Yigit
Headers
Series codeql fixes for various subsystems |

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Sinan Kaya Nov. 22, 2022, 3:30 p.m. UTC
  From: Sinan Kaya <okaya@kernel.org>

rte_class_eth: eth_mac_cmp: The status of this call to rte_eth_dev_info_get
is not checked, potentially leaving dev_info uninitialized.

Signed-off-by: Sinan Kaya <okaya@kernel.org>
---
 lib/ethdev/rte_class_eth.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
  

Comments

Thomas Monjalon Jan. 18, 2023, 8:42 a.m. UTC | #1
22/11/2022 16:30, okaya@kernel.org:
> rte_class_eth: eth_mac_cmp: The status of this call to rte_eth_dev_info_get
> is not checked, potentially leaving dev_info uninitialized.
[...]
>  	/* Return 0 if devargs MAC is matching one of the device MACs. */
> -	rte_eth_dev_info_get(data->port_id, &dev_info);
> +	if (rte_eth_dev_info_get(data->port_id, &dev_info) < 0)
> +		return -1;
> +
>  	for (index = 0; index < dev_info.max_mac_addrs; index++)
>  		if (rte_is_same_ether_addr(&mac, &data->mac_addrs[index]))
>  			return 0;

Acked-by: Thomas Monjalon <thomas@monjalon.net>

You would get more attention if you Cc the maintainers.
You can use this git option: --cc-cmd devtools/get-maintainer.sh
  
Sinan Kaya Jan. 19, 2023, 5:22 a.m. UTC | #2
On Wed, 2023-01-18 at 09:42 +0100, Thomas Monjalon wrote:
> 22/11/2022 16:30, 
> okaya@kernel.org
> :
> 
> > rte_class_eth: eth_mac_cmp: The status of this call to
> > rte_eth_dev_info_get
> > is not checked, potentially leaving dev_info uninitialized.
> 
> [...]
> 
> >        /* Return 0 if devargs MAC is matching one of the device
> > MACs. */
> > -     rte_eth_dev_info_get(data->port_id, &dev_info);
> > +     if (rte_eth_dev_info_get(data->port_id, &dev_info) < 0)
> > +             return -1;
> > +
> >        for (index = 0; index < dev_info.max_mac_addrs; index++)
> >                if (rte_is_same_ether_addr(&mac, &data-
> > >mac_addrs[index]))
> >                        return 0;
> 
> 
> 
> Acked-by: Thomas Monjalon <
> thomas@monjalon.net
> >
> 
> 

Thanks.

> 
> You would get more attention if you Cc the maintainers.
> 
> You can use this git option: --cc-cmd devtools/get-maintainer.sh

Good to know that we have get-maintainer script.
  
Ferruh Yigit Jan. 19, 2023, 2:20 p.m. UTC | #3
On 11/22/2022 3:30 PM, okaya@kernel.org wrote:
> From: Sinan Kaya <okaya@kernel.org>
> 
> rte_class_eth: eth_mac_cmp: The status of this call to rte_eth_dev_info_get
> is not checked, potentially leaving dev_info uninitialized.
> 
> Signed-off-by: Sinan Kaya <okaya@kernel.org>
> ---
>  lib/ethdev/rte_class_eth.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
> index 838b3a8f9f..8165e5adc0 100644
> --- a/lib/ethdev/rte_class_eth.c
> +++ b/lib/ethdev/rte_class_eth.c
> @@ -51,7 +51,9 @@ eth_mac_cmp(const char *key __rte_unused,
>  		return -1; /* invalid devargs value */
>  
>  	/* Return 0 if devargs MAC is matching one of the device MACs. */
> -	rte_eth_dev_info_get(data->port_id, &dev_info);
> +	if (rte_eth_dev_info_get(data->port_id, &dev_info) < 0)
> +		return -1;
> +
>  	for (index = 0; index < dev_info.max_mac_addrs; index++)
>  		if (rte_is_same_ether_addr(&mac, &data->mac_addrs[index]))
>  			return 0;

Minor issue, but before patch, comment about MAC address match applies
to block of code that gets dev_info and does MAC compare.
After patch, get dev_info is separate code block and comment doesn't
really apply to that block, although it is possible to understand what
comment is referring, still I think better to move it down to the block
that does MAC compare.
  

Patch

diff --git a/lib/ethdev/rte_class_eth.c b/lib/ethdev/rte_class_eth.c
index 838b3a8f9f..8165e5adc0 100644
--- a/lib/ethdev/rte_class_eth.c
+++ b/lib/ethdev/rte_class_eth.c
@@ -51,7 +51,9 @@  eth_mac_cmp(const char *key __rte_unused,
 		return -1; /* invalid devargs value */
 
 	/* Return 0 if devargs MAC is matching one of the device MACs. */
-	rte_eth_dev_info_get(data->port_id, &dev_info);
+	if (rte_eth_dev_info_get(data->port_id, &dev_info) < 0)
+		return -1;
+
 	for (index = 0; index < dev_info.max_mac_addrs; index++)
 		if (rte_is_same_ether_addr(&mac, &data->mac_addrs[index]))
 			return 0;