lkml.org 
[lkml]   [2007]   [Jan]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 45/50] IPV4/IPV6: Fix inet{,6} device initialization order.
    -stable review patch.  If anyone has any objections, please let us know.
    ------------------

    From: David L Stevens <dlstevens@us.ibm.com>

    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>
    Signed-off-by: Chris Wright <chrisw@sous-sol.org>
    ---
    commit 30c4cf577fb5b68c16e5750d6bdbd7072e42b279

    net/ipv4/devinet.c | 5 +++--
    net/ipv6/addrconf.c | 4 ++--
    2 files changed, 5 insertions(+), 4 deletions(-)

    --- linux-2.6.19.1.orig/net/ipv4/devinet.c
    +++ linux-2.6.19.1/net/ipv4/devinet.c
    @@ -165,9 +165,8 @@ struct in_device *inetdev_init(struct ne
    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 ne
    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);
    --- linux-2.6.19.1.orig/net/ipv6/addrconf.c
    +++ linux-2.6.19.1/net/ipv6/addrconf.c
    @@ -413,8 +413,6 @@ static struct inet6_dev * ipv6_add_dev(s
    if (netif_carrier_ok(dev))
    ndev->if_flags |= IF_READY;

    - /* protected by rtnl_lock */
    - rcu_assign_pointer(dev->ip6_ptr, ndev);

    ipv6_mc_init_dev(ndev);
    ndev->tstamp = jiffies;
    @@ -425,6 +423,8 @@ static struct inet6_dev * ipv6_add_dev(s
    NULL);
    addrconf_sysctl_register(ndev, &ndev->cnf);
    #endif
    + /* protected by rtnl_lock */
    + rcu_assign_pointer(dev->ip6_ptr, ndev);
    return ndev;
    }

    --
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-01-06 03:41    [W:0.022 / U:30.060 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site