[dpdk-dev] ethdev: fix build with gcc 5.4.0

Message ID 20170706214532.31274-1-thomas@monjalon.net (mailing list archive)
State Accepted, archived
Delegated to: Thomas Monjalon
Headers

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/Intel-compilation fail Compilation issues

Commit Message

Thomas Monjalon July 6, 2017, 9:45 p.m. UTC
  Seen on Ubuntu 16.04 with GCC 5.4.0:

lib/librte_ether/rte_ethdev.c: In function 'get_mac_addr_index':
lib/librte_ether/rte_ethdev.c:2369:26: error:
'dev_info.max_mac_addrs' may be used uninitialized in this function

Indeed, rte_eth_dev_info_get() do not write into dev_info
if the port_id is not valid.
So we need to check the port_id and return in case of error.

This extra check should not be needed because the port_id is always
checked before calling get_mac_addr_index().
However it does not hurt.

Reported-by: Matan Azrad <matan@mellanox.com>
Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
Tested-by: Matan Azrad <matan@mellanox.com>
---
 lib/librte_ether/rte_ethdev.c | 1 +
 1 file changed, 1 insertion(+)
  

Comments

Thomas Monjalon July 13, 2017, 9:35 a.m. UTC | #1
06/07/2017 23:45, Thomas Monjalon:
> Seen on Ubuntu 16.04 with GCC 5.4.0:
> 
> lib/librte_ether/rte_ethdev.c: In function 'get_mac_addr_index':
> lib/librte_ether/rte_ethdev.c:2369:26: error:
> 'dev_info.max_mac_addrs' may be used uninitialized in this function
> 
> Indeed, rte_eth_dev_info_get() do not write into dev_info
> if the port_id is not valid.
> So we need to check the port_id and return in case of error.
> 
> This extra check should not be needed because the port_id is always
> checked before calling get_mac_addr_index().
> However it does not hurt.
> 
> Reported-by: Matan Azrad <matan@mellanox.com>
> Signed-off-by: Thomas Monjalon <thomas@monjalon.net>
> Tested-by: Matan Azrad <matan@mellanox.com>

Applied
  

Patch

diff --git a/lib/librte_ether/rte_ethdev.c b/lib/librte_ether/rte_ethdev.c
index 957ae2a17..b038f281b 100644
--- a/lib/librte_ether/rte_ethdev.c
+++ b/lib/librte_ether/rte_ethdev.c
@@ -2357,6 +2357,7 @@  get_mac_addr_index(uint8_t port_id, const struct ether_addr *addr)
 	struct rte_eth_dev *dev = &rte_eth_devices[port_id];
 	unsigned i;
 
+	RTE_ETH_VALID_PORTID_OR_ERR_RET(port_id, -ENODEV);
 	rte_eth_dev_info_get(port_id, &dev_info);
 
 	for (i = 0; i < dev_info.max_mac_addrs; i++)