Skip to contentSkip to conversation

net: dsa: Fix NPD checking for br_vlan_enabled()

PATCH In review Florian Fainelli 2 participants 2 messages Feb 18, 2019 – Feb 19, 2019

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: dsa: Fix NPD checking for br_vlan_enabled()

It is possible for the DSA slave network device not to be part of a bridge, yet have an upper device like a VLAN device be part of a bridge. When that VLAN device is enslaved, since it does not define any switchdev_ops, we will recurse down to the lower/physical port device, call switchdev_port_obj_add() with a VLAN, and here we will check br_vlan_enabled() on a NULL dp->bridge_dev, thus causing a NULL pointer de-reference.

This is no longer a problem upstream after commit d17d9f5e5143 ("switchdev: Replace port obj add/del SDO with a notification").

Fixes 2ea7a679ca2a ("net: dsa: Don't add vlans when vlan filtering is disabled")

---
David,

This affects v4.15..v4.19, but not v5.0-rc1 can you still queue this up for -stable? Thanks!

 net/dsa/port.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
net/dsa/port.c +2 -2
index ed0595459df1..792a13068c50 100644
@@ -255,7 +255,7 @@ int dsa_port_vlan_add(struct dsa_port *dp,
 	if (netif_is_bridge_master(vlan->obj.orig_dev))
 		return -EOPNOTSUPP;
 
-	if (br_vlan_enabled(dp->bridge_dev))
+	if (dp->bridge_dev && br_vlan_enabled(dp->bridge_dev))
 		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_ADD, &info);
 
 	return 0;
@@ -273,7 +273,7 @@ int dsa_port_vlan_del(struct dsa_port *dp,
 	if (netif_is_bridge_master(vlan->obj.orig_dev))
 		return -EOPNOTSUPP;
 
-	if (br_vlan_enabled(dp->bridge_dev))
+	if (dp->bridge_dev && br_vlan_enabled(dp->bridge_dev))
 		return dsa_port_notify(dp, DSA_NOTIFIER_VLAN_DEL, &info);
 
 	return 0;
Signature · 1 line
2.19.1
maintainer
#1 lore raw

From: Florian Fainelli <[email protected]>
Date: Mon, 18 Feb 2019 14:30:11 -0800

Quoted 11 lines

It is possible for the DSA slave network device not to be part of a bridge, yet have an upper device like a VLAN device be part of a bridge. When that VLAN device is enslaved, since it does not define any switchdev_ops, we will recurse down to the lower/physical port device, call switchdev_port_obj_add() with a VLAN, and here we will check br_vlan_enabled() on a NULL dp->bridge_dev, thus causing a NULL pointer de-reference.

This is no longer a problem upstream after commit d17d9f5e5143 ("switchdev: Replace port obj add/del SDO with a notification").

Quoted 8 lines
Fixes 2ea7a679ca2a ("net: dsa: Don't add vlans when vlan filtering is disabled")

---
David,

This affects v4.15..v4.19, but not v5.0-rc1 can you still queue this up for -stable? Thanks!

Queued up.