Patch "mlxsw: spectrum_router: Fix NULL pointer dereference" has been added to the 4.11-stable tree

This is a note to let you know that I've just added the patch titled

mlxsw: spectrum_router: Fix NULL pointer dereference

to the 4.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
mlxsw-spectrum_router-fix-null-pointer-dereference.patch
and it can be found in the queue-4.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Ido Schimmel <[email protected]>
Date: Wed, 28 Jun 2017 09:03:12 +0300
Subject: mlxsw: spectrum_router: Fix NULL pointer dereference

From: Ido Schimmel <[email protected]>

[ Upstream commit 6b27c8adf27edf1dabe2cdcfaa101ef7e2712415 ]

In case a VLAN device is enslaved to a bridge we shouldn't create a router interface (RIF) for it when it's configured with an IP address. This is already handled by the driver for other types of netdevs, such as physical ports and LAG devices.

If this IP address is then removed and the interface is subsequently unlinked from the bridge, a NULL pointer dereference can happen, as the original 802.1d FID was replaced with an rFID which was then deleted.

To reproduce:

$ ip link set dev enp3s0np9 up
$ ip link add name enp3s0np9.111 link enp3s0np9 type vlan id 111
$ ip link set dev enp3s0np9.111 up
$ ip link add name br0 type bridge
$ ip link set dev br0 up
$ ip link set enp3s0np9.111 master br0
$ ip address add dev enp3s0np9.111 192.168.0.1/24
$ ip address del dev enp3s0np9.111 192.168.0.1/24
$ ip link set dev enp3s0np9.111 nomaster

---
 drivers/net/ethernet/mellanox/mlxsw/spectrum.c |    3 +++
 1 file changed, 3 insertions(+)

@@ -3829,6 +3829,9 @@ static int mlxsw_sp_inetaddr_vlan_event(
 	struct mlxsw_sp *mlxsw_sp = mlxsw_sp_lower_get(vlan_dev);
 	u16 vid = vlan_dev_vlan_id(vlan_dev);
 
+	if (netif_is_bridge_port(vlan_dev))
+		return 0;
+
 	if (mlxsw_sp_port_dev_check(real_dev))
 		return mlxsw_sp_inetaddr_vport_event(vlan_dev, real_dev, event,
 						     vid);

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/mlxsw-spectrum_router-fix-null-pointer-dereference.patch