net: dsa: Do not leave DSA master with NULL netdev_ops
[ Upstream commit050569fc83
] 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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e781af2fdc
commit
5ffd49c52b
|
@ -259,6 +259,7 @@ static void dsa_master_ndo_teardown(struct net_device *dev)
|
||||||
{
|
{
|
||||||
struct dsa_port *cpu_dp = dev->dsa_ptr;
|
struct dsa_port *cpu_dp = dev->dsa_ptr;
|
||||||
|
|
||||||
|
if (cpu_dp->orig_ndo_ops)
|
||||||
dev->netdev_ops = cpu_dp->orig_ndo_ops;
|
dev->netdev_ops = cpu_dp->orig_ndo_ops;
|
||||||
cpu_dp->orig_ndo_ops = NULL;
|
cpu_dp->orig_ndo_ops = NULL;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue