macvlan: better mode validation

PATCH New Michael S. Tsirkin 1 participant 1 message Aug 1, 2013

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

Michael S. Tsirkin

author

2013-08-01 10:41 UTC #0 lore raw

PATCH 1/1 macvlan: better mode validation

macvlan passthrough mode is special: it's not possible to switch to or from it through a netlink command.

But if you try, the command will succeed, which is confusing.

Validate input and return error to user.

Cc Sridhar Samudrala <[email protected]>

Cc "David S. Miller" <[email protected]>

Signed-off-by Michael S. Tsirkin <[email protected]>

---
 drivers/net/macvlan.c | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

drivers/net/macvlan.c +14 -2

index 18373b6..13937f9 100644
@@ -863,6 +863,18 @@ static int macvlan_changelink(struct net_device *dev,
 		struct nlattr *tb[], struct nlattr *data[])
 {
 	struct macvlan_dev *vlan = netdev_priv(dev);
+	enum macvlan_mode mode;
+	bool set_mode = false;
+
+	/* Validate mode, but don't set yet: setting flags may fail. */
+	if (data && data[IFLA_MACVLAN_MODE]) {
+		set_mode = true;
+		mode = nla_get_u32(data[IFLA_MACVLAN_MODE]);
+		/* Passthrough mode can't be set or cleared dynamically */
+		if ((mode == MACVLAN_MODE_PASSTHRU) !=
+		    (vlan->mode == MACVLAN_MODE_PASSTHRU))
+			return -EINVAL;
+	}
 
 	if (data && data[IFLA_MACVLAN_FLAGS]) {
 		__u16 flags = nla_get_u16(data[IFLA_MACVLAN_FLAGS]);

@@ -879,8 +891,8 @@ static int macvlan_changelink(struct net_device *dev,
 		}
 		vlan->flags = flags;
 	}
-	if (data && data[IFLA_MACVLAN_MODE])
-		vlan->mode = nla_get_u32(data[IFLA_MACVLAN_MODE]);
+	if (set_mode)
+		vlan->mode = mode;
 	return 0;
 }

Signature · 1 line

MST