diff options
| author |   David L Stevens <dlstevens@us.ibm.com> | 2007-01-04 12:31:14 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2007-01-04 12:31:14 -0800 |
| commit | 30c4cf577fb5b68c16e5750d6bdbd7072e42b279 (patch) | |
| tree | 36f558c08ebdd1830536aab92b8abac79330cdbc /net/ipv4 | |
| parent | [TCP]: Use old definition of before (diff) | |
| download | linux-dev-30c4cf577fb5b68c16e5750d6bdbd7072e42b279.tar.xz linux-dev-30c4cf577fb5b68c16e5750d6bdbd7072e42b279.zip | |
[IPV4/IPV6]: Fix inet{,6} device initialization order.
It is important that we only assign dev->ip{,6}_ptr
only after all portions of the inet{,6} are setup.
Otherwise we can receive packets before the multicast
spinlocks et al. are initialized.
Signed-off-by: David L Stevens <dlstevens@us.ibm.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -rw-r--r-- | net/ipv4/devinet.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/ipv4/devinet.c b/net/ipv4/devinet.c index 84bed40273ad..25c8a42965df 100644 --- a/net/ipv4/devinet.c +++ b/net/ipv4/devinet.c @@ -165,9 +165,8 @@ struct in_device *inetdev_init(struct net_device *dev) NET_IPV4_NEIGH, "ipv4", NULL, NULL); #endif - /* Account for reference dev->ip_ptr */ + /* Account for reference dev->ip_ptr (below) */ in_dev_hold(in_dev); - rcu_assign_pointer(dev->ip_ptr, in_dev); #ifdef CONFIG_SYSCTL devinet_sysctl_register(in_dev, &in_dev->cnf); @@ -176,6 +175,8 @@ struct in_device *inetdev_init(struct net_device *dev) if (dev->flags & IFF_UP) ip_mc_up(in_dev); out: + /* we can receive as soon as ip_ptr is set -- do this last */ + rcu_assign_pointer(dev->ip_ptr, in_dev); return in_dev; out_kfree: kfree(in_dev); |