From: Florian Fainelli Date: Mon, 18 Feb 2019 22:30:11 +0000 (-0800) Subject: net: dsa: Fix NPD checking for br_vlan_enabled() X-Git-Tag: v4.20.13~52 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=28f7d528b3f0588adbf2400bed8b9863bd43add1;p=thirdparty%2Fkernel%2Fstable.git net: dsa: Fix NPD checking for br_vlan_enabled() [ Upstream not applicable ] 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") Reported-by: Frank Wunderlich Signed-off-by: Florian Fainelli Signed-off-by: Greg Kroah-Hartman --- diff --git a/net/dsa/port.c b/net/dsa/port.c index ed0595459df13..792a13068c50b 100644 --- a/net/dsa/port.c +++ b/net/dsa/port.c @@ -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;