diff options
| author |   Florian Fainelli <f.fainelli@gmail.com> | 2020-05-04 13:18:06 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2020-05-06 17:31:54 -0700 |
| commit | 050569fc8384c8056bacefcc246bcb2dfe574936 (patch) | |
| tree | 6b4fd984dc23bfc5a0d090b8194db878fc67f8c7 | |
| parent | net: dsa: remove duplicate assignment in dsa_slave_add_cls_matchall_mirred (diff) | |
| download | wireguard-linux-050569fc8384c8056bacefcc246bcb2dfe574936.tar.xz wireguard-linux-050569fc8384c8056bacefcc246bcb2dfe574936.zip | |
net: dsa: Do not leave DSA master with NULL netdev_ops
When ndo_get_phys_port_name() for the CPU port was added we introduced
an early check for when the DSA master network device in
dsa_master_ndo_setup() already implements ndo_get_phys_port_name(). When
we perform the teardown operation in dsa_master_ndo_teardown() we would
not be checking that cpu_dp->orig_ndo_ops was successfully allocated and
non-NULL initialized.
With network device drivers such as virtio_net, this leads to a NPD as
soon as the DSA switch hanging off of it gets torn down because we are
now assigning the virtio_net device's netdev_ops a NULL pointer.
Fixes: da7b9e9b00d4 ("net: dsa: Add ndo_get_phys_port_name() for CPU port")
Reported-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Tested-by: Allen Pais <allen.pais@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | net/dsa/master.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/dsa/master.c b/net/dsa/master.c index b5c535af63a3..a621367c6e8c 100644 --- a/net/dsa/master.c +++ b/net/dsa/master.c @@ -289,7 +289,8 @@ static void dsa_master_ndo_teardown(struct net_device *dev) { struct dsa_port *cpu_dp = dev->dsa_ptr; - dev->netdev_ops = cpu_dp->orig_ndo_ops; + if (cpu_dp->orig_ndo_ops) + dev->netdev_ops = cpu_dp->orig_ndo_ops; cpu_dp->orig_ndo_ops = NULL; } |