mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-31 16:38:12 +00:00
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: da7b9e9b00
("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>
This commit is contained in:
parent
657221598f
commit
050569fc83
1 changed files with 2 additions and 1 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue