Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae0e8e82 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by David S. Miller
Browse files

veth: prevent oops caused by netdev destructor 



From: Stephen Hemminger <shemminger@vyatta.com>

The veth driver will oops if sysfs hooks are open while module is removed.

The net device destructor can not point to code in a module; basically
there are only two possible safe values: NULL - no destructor, or
free_netdev - free on last use

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6a783c90

drivers/net/veth.c

+16 −25
Original line number Diff line number Diff line
@@ -210,14 +210,11 @@ static int veth_xmit(struct sk_buff *skb, struct net_device *dev) 


static struct net_device_stats *veth_get_stats(struct net_device *dev)

{

	struct veth_priv *priv;

	struct net_device_stats *dev_stats;

	int cpu;

	struct veth_priv *priv = netdev_priv(dev);

	struct net_device_stats *dev_stats = &dev->stats;

	unsigned int cpu;

	struct veth_net_stats *stats;



	priv = netdev_priv(dev);

	dev_stats = &dev->stats;



	dev_stats->rx_packets = 0;

	dev_stats->tx_packets = 0;

	dev_stats->rx_bytes = 0;
@@ -225,6 +222,7 @@ static struct net_device_stats *veth_get_stats(struct net_device *dev) 
	dev_stats->tx_dropped = 0;

	dev_stats->rx_dropped = 0;



	if (priv->stats)

		for_each_online_cpu(cpu) {

			stats = per_cpu_ptr(priv->stats, cpu);
@@ -261,6 +259,8 @@ static int veth_close(struct net_device *dev) 
	netif_carrier_off(dev);

	netif_carrier_off(priv->peer);



	free_percpu(priv->stats);

	priv->stats = NULL;

	return 0;

}
@@ -291,15 +291,6 @@ static int veth_dev_init(struct net_device *dev) 
	return 0;

}



static void veth_dev_free(struct net_device *dev)

{

	struct veth_priv *priv;



	priv = netdev_priv(dev);

	free_percpu(priv->stats);

	free_netdev(dev);

}



static const struct net_device_ops veth_netdev_ops = {

	.ndo_init            = veth_dev_init,

	.ndo_open            = veth_open,
@@ -317,7 +308,7 @@ static void veth_setup(struct net_device *dev) 
	dev->netdev_ops = &veth_netdev_ops;

	dev->ethtool_ops = &veth_ethtool_ops;

	dev->features |= NETIF_F_LLTX;

	dev->destructor = veth_dev_free;

	dev->destructor = free_netdev;

}



/*