[PATCH net] net/octep_ep: Validate the VF ID

[PATCH net] net/octep_ep: Validate the VF ID

[Kamal Heib]

Make sure that the VF ID is valid before trying to access the VF.

Fixes: 8a241ef9b9b8 ("octeon_ep: add ndo ops for VFs in PF driver")
Signed-off-by: Kamal Heib <kheib@redhat.com>
---
 .../net/ethernet/marvell/octeon_ep/octep_main.c  | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
index 24499bb36c00..eaafbc0a55b1 100644
--- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
+++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
@@ -1124,11 +1124,24 @@ static int octep_set_features(struct net_device *dev, netdev_features_t features
 	return err;
 }
 
+static bool octep_validate_vf(struct octep_device *oct, int vf)
+{
+	if (vf >= CFG_GET_ACTIVE_VFS(oct->conf)) {
+		dev_err(&oct->pdev->dev, "Invalid VF ID %d\n", vf);
+		return false;
+	}
+
+	return true;
+}
+
 static int octep_get_vf_config(struct net_device *dev, int vf,
 			       struct ifla_vf_info *ivi)
 {
 	struct octep_device *oct = netdev_priv(dev);
 
+	if (!octep_validate_vf(oct, vf))
+		return -EINVAL;
+
 	ivi->vf = vf;
 	ether_addr_copy(ivi->mac, oct->vf_info[vf].mac_addr);
 	ivi->spoofchk = true;
@@ -1143,6 +1156,9 @@ static int octep_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
 	struct octep_device *oct = netdev_priv(dev);
 	int err;
 
+	if (!octep_validate_vf(oct, vf))
+		return -EINVAL;
+
 	if (!is_valid_ether_addr(mac)) {
 		dev_err(&oct->pdev->dev, "Invalid  MAC Address %pM\n", mac);
 		return -EADDRNOTAVAIL;
-- 
2.51.0

Re: [PATCH net] net/octep_ep: Validate the VF ID

[Michal Swiatkowski]

On Mon, Sep 08, 2025 at 07:11:58PM -0400, Kamal Heib wrote:
> Make sure that the VF ID is valid before trying to access the VF.
> 
> Fixes: 8a241ef9b9b8 ("octeon_ep: add ndo ops for VFs in PF driver")
> Signed-off-by: Kamal Heib <kheib@redhat.com>
> ---
>  .../net/ethernet/marvell/octeon_ep/octep_main.c  | 16 ++++++++++++++++
>  1 file changed, 16 insertions(+)
> 
> diff --git a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
> index 24499bb36c00..eaafbc0a55b1 100644
> --- a/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
> +++ b/drivers/net/ethernet/marvell/octeon_ep/octep_main.c
> @@ -1124,11 +1124,24 @@ static int octep_set_features(struct net_device *dev, netdev_features_t features
>  	return err;
>  }
>  
> +static bool octep_validate_vf(struct octep_device *oct, int vf)
nit, looks like octep_is_vf_valid() fits better here.

> +{
> +	if (vf >= CFG_GET_ACTIVE_VFS(oct->conf)) {
> +		dev_err(&oct->pdev->dev, "Invalid VF ID %d\n", vf);
> +		return false;
> +	}
> +
> +	return true;
> +}
> +
>  static int octep_get_vf_config(struct net_device *dev, int vf,
>  			       struct ifla_vf_info *ivi)
>  {
>  	struct octep_device *oct = netdev_priv(dev);
>  
> +	if (!octep_validate_vf(oct, vf))
> +		return -EINVAL;
> +
>  	ivi->vf = vf;
>  	ether_addr_copy(ivi->mac, oct->vf_info[vf].mac_addr);
>  	ivi->spoofchk = true;
> @@ -1143,6 +1156,9 @@ static int octep_set_vf_mac(struct net_device *dev, int vf, u8 *mac)
>  	struct octep_device *oct = netdev_priv(dev);
>  	int err;
>  
> +	if (!octep_validate_vf(oct, vf))
> +		return -EINVAL;
> +
>  	if (!is_valid_ether_addr(mac)) {
>  		dev_err(&oct->pdev->dev, "Invalid  MAC Address %pM\n", mac);
>  		return -EADDRNOTAVAIL;

Make sense, you can add reproduction steps and what happens when the ID
is incorrect, but it is up to you.

Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>

> -- 
> 2.51.0