net/ice/base: fix out of memory bound for MAC addresses

Message ID 20210317060219.2162370-1-qi.z.zhang@intel.com (mailing list archive)
State Accepted, archived
Delegated to: Qi Zhang
Headers
Series net/ice/base: fix out of memory bound for MAC addresses |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-abi-testing success Testing PASS
ci/Intel-compilation success Compilation OK
ci/travis-robot success travis build: passed
ci/github-robot success github build: passed
ci/intel-Testing success Testing PASS
ci/iol-testing warning Testing issues
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS

Commit Message

Qi Zhang March 17, 2021, 6:02 a.m. UTC
  Not enough memory be allocated for dev->data->mac_address which
cause out of bound memory access when iterate all mac addresses by
dev_info.max_mac_addrs.

Fixes: f9cf4f864150 ("net/ice: support device initialization")
Cc: stable@dpdk.org

Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
---
 drivers/net/ice/ice_ethdev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Qiming Yang March 18, 2021, 2:07 a.m. UTC | #1
> -----Original Message-----
> From: Zhang, Qi Z <qi.z.zhang@intel.com>
> Sent: Wednesday, March 17, 2021 14:02
> To: Yang, Qiming <qiming.yang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> <qi.z.zhang@intel.com>; stable@dpdk.org
> Subject: [PATCH] net/ice/base: fix out of memory bound for MAC addresses
> 
> Not enough memory be allocated for dev->data->mac_address which cause
> out of bound memory access when iterate all mac addresses by
> dev_info.max_mac_addrs.
> 
> Fixes: f9cf4f864150 ("net/ice: support device initialization")
> Cc: stable@dpdk.org
> 
> Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
> Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> ---
>  drivers/net/ice/ice_ethdev.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
> index 8999d441ac..22104250fa 100644
> --- a/drivers/net/ice/ice_ethdev.c
> +++ b/drivers/net/ice/ice_ethdev.c
> @@ -809,7 +809,7 @@ ice_init_mac_address(struct rte_eth_dev *dev)
>  		(struct rte_ether_addr *)hw->port_info[0].mac.perm_addr);
> 
>  	dev->data->mac_addrs =
> -		rte_zmalloc(NULL, sizeof(struct rte_ether_addr), 0);
> +		rte_zmalloc(NULL, sizeof(struct rte_ether_addr) *
> +ICE_NUM_MACADDR_MAX, 0);
>  	if (!dev->data->mac_addrs) {
>  		PMD_INIT_LOG(ERR,
>  			     "Failed to allocate memory to store mac address");
> --
> 2.26.2

Acked-by: Qiming Yang <qiming.yang@intel.com>
  
Qi Zhang March 24, 2021, 1:03 p.m. UTC | #2
> -----Original Message-----
> From: Yang, Qiming <qiming.yang@intel.com>
> Sent: Thursday, March 18, 2021 10:07 AM
> To: Zhang, Qi Z <qi.z.zhang@intel.com>
> Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; stable@dpdk.org
> Subject: RE: [PATCH] net/ice/base: fix out of memory bound for MAC
> addresses
> 
> 
> > -----Original Message-----
> > From: Zhang, Qi Z <qi.z.zhang@intel.com>
> > Sent: Wednesday, March 17, 2021 14:02
> > To: Yang, Qiming <qiming.yang@intel.com>
> > Cc: dev@dpdk.org; Yigit, Ferruh <ferruh.yigit@intel.com>; Zhang, Qi Z
> > <qi.z.zhang@intel.com>; stable@dpdk.org
> > Subject: [PATCH] net/ice/base: fix out of memory bound for MAC
> > addresses
> >
> > Not enough memory be allocated for dev->data->mac_address which cause
> > out of bound memory access when iterate all mac addresses by
> > dev_info.max_mac_addrs.
> >
> > Fixes: f9cf4f864150 ("net/ice: support device initialization")
> > Cc: stable@dpdk.org
> >
> > Reported-by: Ferruh Yigit <ferruh.yigit@intel.com>
> > Signed-off-by: Qi Zhang <qi.z.zhang@intel.com>
> > ---
> >  drivers/net/ice/ice_ethdev.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/net/ice/ice_ethdev.c
> > b/drivers/net/ice/ice_ethdev.c index 8999d441ac..22104250fa 100644
> > --- a/drivers/net/ice/ice_ethdev.c
> > +++ b/drivers/net/ice/ice_ethdev.c
> > @@ -809,7 +809,7 @@ ice_init_mac_address(struct rte_eth_dev *dev)
> > (struct rte_ether_addr *)hw->port_info[0].mac.perm_addr);
> >
> >  dev->data->mac_addrs =
> > -rte_zmalloc(NULL, sizeof(struct rte_ether_addr), 0);
> > +rte_zmalloc(NULL, sizeof(struct rte_ether_addr) *
> > +ICE_NUM_MACADDR_MAX, 0);
> >  if (!dev->data->mac_addrs) {
> >  PMD_INIT_LOG(ERR,
> >       "Failed to allocate memory to store mac address");
> > --
> > 2.26.2
> 
> Acked-by: Qiming Yang <qiming.yang@intel.com>

Applied to dpdk-next-net-intel.

Thanks
Qi
  

Patch

diff --git a/drivers/net/ice/ice_ethdev.c b/drivers/net/ice/ice_ethdev.c
index 8999d441ac..22104250fa 100644
--- a/drivers/net/ice/ice_ethdev.c
+++ b/drivers/net/ice/ice_ethdev.c
@@ -809,7 +809,7 @@  ice_init_mac_address(struct rte_eth_dev *dev)
 		(struct rte_ether_addr *)hw->port_info[0].mac.perm_addr);
 
 	dev->data->mac_addrs =
-		rte_zmalloc(NULL, sizeof(struct rte_ether_addr), 0);
+		rte_zmalloc(NULL, sizeof(struct rte_ether_addr) * ICE_NUM_MACADDR_MAX, 0);
 	if (!dev->data->mac_addrs) {
 		PMD_INIT_LOG(ERR,
 			     "Failed to allocate memory to store mac address");