[PATCH net v2] octeon_ep: Validate the VF ID

[PATCH net v2] octeon_ep: Validate the VF ID

[Kamal Heib]

Add a helper to validate the VF ID and use it in the VF ndo ops to
prevent accessing out-of-range entries.

Without this check, users can run commands such as:

 # ip link show dev enp135s0
 2: enp135s0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
    link/ether 00:00:00:01:01:00 brd ff:ff:ff:ff:ff:ff
    vf 0     link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state enable, trust off
    vf 1     link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state enable, trust off
 # ip link set dev enp135s0 vf 4 mac 00:00:00:00:00:14
 # echo $?
 0

even though VF 4 does not exist, which results in silent success instead
of returning an error.

Fixes: 8a241ef9b9b8 ("octeon_ep: add ndo ops for VFs in PF driver")
Signed-off-by: Kamal Heib <kheib@redhat.com>
Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
---
v2: Address the comments from Michal.
---
 .../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..861341a883f0 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_is_vf_valid(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_is_vf_valid(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_is_vf_valid(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 v2] octeon_ep: Validate the VF ID

[Simon Horman]

On Tue, Sep 09, 2025 at 09:10:20AM -0400, Kamal Heib wrote:
> Add a helper to validate the VF ID and use it in the VF ndo ops to
> prevent accessing out-of-range entries.
> 
> Without this check, users can run commands such as:
> 
>  # ip link show dev enp135s0
>  2: enp135s0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc mq state UP mode DEFAULT group default qlen 1000
>     link/ether 00:00:00:01:01:00 brd ff:ff:ff:ff:ff:ff
>     vf 0     link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state enable, trust off
>     vf 1     link/ether 00:00:00:00:00:00 brd ff:ff:ff:ff:ff:ff, spoof checking on, link-state enable, trust off
>  # ip link set dev enp135s0 vf 4 mac 00:00:00:00:00:14
>  # echo $?
>  0
> 
> even though VF 4 does not exist, which results in silent success instead
> of returning an error.
> 
> Fixes: 8a241ef9b9b8 ("octeon_ep: add ndo ops for VFs in PF driver")
> Signed-off-by: Kamal Heib <kheib@redhat.com>
> Reviewed-by: Michal Swiatkowski <michal.swiatkowski@linux.intel.com>
> ---
> v2: Address the comments from Michal.

Thanks Kamal,

This looks good to me.

Reviewed-by: Simon Horman <horms@kernel.org>

For future reference: please allow 24h to elapse between patch revisions.

Re: [PATCH net v2] octeon_ep: Validate the VF ID

[Jakub Kicinski]

On Tue,  9 Sep 2025 09:10:20 -0400 Kamal Heib wrote:
> +static bool octep_is_vf_valid(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;

perhaps a nit, but why did you choose dev_err() over netdev_err()?
The incoming handle is a netdev.
-- 
pw-bot: cr

Re: [PATCH net v2] octeon_ep: Validate the VF ID

[Kamal Heib]

On Wed, Sep 10, 2025 at 07:26:58PM -0700, Jakub Kicinski wrote:
> On Tue,  9 Sep 2025 09:10:20 -0400 Kamal Heib wrote:
> > +static bool octep_is_vf_valid(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;
> 
> perhaps a nit, but why did you choose dev_err() over netdev_err()?
> The incoming handle is a netdev.

Thanks for your review.

I believe I saw one of the ethernet drivers using dev_err() instead of
netdev_err(), but I agree with you. I'll change it to netdev_err().