[dpdk-dev] [PATCH v4] net/bonding: fix invalid port using

[Yang, Qiming]

> -----Original Message-----
> From: Jiang, JunyuX
> Sent: Tuesday, October 29, 2019 10:24 AM
> To: dev at dpdk.org
> Cc: Chas Williams <chas3 at att.com>; Yang, Qiming <qiming.yang at intel.com>;
> Jiang, JunyuX <junyux.jiang at intel.com>; stable at dpdk.org
> Subject: [PATCH v4] net/bonding: fix invalid port using
> 
> Port validation should be prior to getting device data to avoid segment fault.
> This patch fixed the segment fault caused by invalid port using.
> 
> Fixes: 6d72657ce379 ("net/bonding: add other aggregator modes")
> Fixes: 112891cd27e5 ("net/bonding: add dedicated HW queues for LACP
> control")
> Cc: stable at dpdk.org
> 
> Signed-off-by: Jiang JunyuX <junyux.jiang at intel.com>
> ---
>  drivers/net/bonding/rte_eth_bond_8023ad.c | 32 ++++++++++++++++-------
>  1 file changed, 22 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/net/bonding/rte_eth_bond_8023ad.c
> b/drivers/net/bonding/rte_eth_bond_8023ad.c
> index 7d8da2b31..682854e39 100644
> --- a/drivers/net/bonding/rte_eth_bond_8023ad.c
> +++ b/drivers/net/bonding/rte_eth_bond_8023ad.c
> @@ -1387,11 +1387,12 @@
> rte_eth_bond_8023ad_agg_selection_set(uint16_t port_id,
>  	struct bond_dev_private *internals;
>  	struct mode8023ad_private *mode4;
> 
> +	if (valid_bonded_port_id(port_id) != 0)
> +		return -EINVAL;
> +
>  	bond_dev = &rte_eth_devices[port_id];
>  	internals = bond_dev->data->dev_private;
> 
> -	if (valid_bonded_port_id(port_id) != 0)
> -		return -EINVAL;
>  	if (internals->mode != 4)
>  		return -EINVAL;
> 
> @@ -1408,11 +1409,12 @@ int
> rte_eth_bond_8023ad_agg_selection_get(uint16_t port_id)
>  	struct bond_dev_private *internals;
>  	struct mode8023ad_private *mode4;
> 
> +	if (valid_bonded_port_id(port_id) != 0)
> +		return -EINVAL;
> +
>  	bond_dev = &rte_eth_devices[port_id];
>  	internals = bond_dev->data->dev_private;
> 
> -	if (valid_bonded_port_id(port_id) != 0)
> -		return -EINVAL;
>  	if (internals->mode != 4)
>  		return -EINVAL;
>  	mode4 = &internals->mode4;
> @@ -1665,9 +1667,14 @@ int
>  rte_eth_bond_8023ad_dedicated_queues_enable(uint16_t port)  {
>  	int retval = 0;
> -	struct rte_eth_dev *dev = &rte_eth_devices[port];
> -	struct bond_dev_private *internals = (struct bond_dev_private *)
> -		dev->data->dev_private;
> +	struct rte_eth_dev *dev;
> +	struct bond_dev_private *internals;
> +
> +	if (valid_bonded_port_id(port) != 0)
> +		return -EINVAL;
> +
> +	dev = &rte_eth_devices[port];
> +	internals = dev->data->dev_private;
> 
>  	if (check_for_bonded_ethdev(dev) != 0)
>  		return -1;
> @@ -1689,9 +1696,14 @@ int
>  rte_eth_bond_8023ad_dedicated_queues_disable(uint16_t port)  {
>  	int retval = 0;
> -	struct rte_eth_dev *dev = &rte_eth_devices[port];
> -	struct bond_dev_private *internals = (struct bond_dev_private *)
> -		dev->data->dev_private;
> +	struct rte_eth_dev *dev;
> +	struct bond_dev_private *internals;
> +
> +	if (valid_bonded_port_id(port) != 0)
> +		return -EINVAL;
> +
> +	dev = &rte_eth_devices[port];
> +	internals = dev->data->dev_private;
> 
>  	if (check_for_bonded_ethdev(dev) != 0)
>  		return -1;
> --
> 2.17.1 

Reviewed-by: Qiming Yang <qiming.yang at intel.com>