Attachment 312638 Details for Bug 456653 – Backport of git 30c4cf577fb5b68c16e5750d6bdbd7072e42b279 to 2.6.9-67.0.22.EL

[patch] Backport of git 30c4cf577fb5b68c16e5750d6bdbd7072e42b279 to 2.6.9-67.0.22.EL

git-30c4cf577fb5b68c16e5750d6bdbd7072e42b279 (text/plain), 2.11 KB, created by Ian Campbell on 2008-07-25 11:31:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Campbell

Created: 2008-07-25 11:31:35 UTC

Size: 2.11 KB

patch

obsolete

>commit 30c4cf577fb5b68c16e5750d6bdbd7072e42b279
>Author: David L Stevens <dlstevens@us.ibm.com>
>Date:   Thu Jan 4 12:31:14 2007 -0800
>
>    [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>
>
>[ian.campbell@citrix.com: backport to RHEL4 2.6.9]
>
>Index: linux-2.6.9-67.0.20.EL/net/ipv4/devinet.c
>===================================================================
>--- linux-2.6.9-67.0.20.EL.orig/net/ipv4/devinet.c	2008-07-25 09:56:21.000000000 +0100
>+++ linux-2.6.9-67.0.20.EL/net/ipv4/devinet.c	2008-07-25 09:58:50.000000000 +0100
>@@ -156,10 +156,8 @@
> 			      NET_IPV4_NEIGH, "ipv4", NULL);
> #endif
> 
>-	/* Account for reference dev->ip_ptr */
>+	/* Account for reference dev->ip_ptr (below) */
> 	in_dev_hold(in_dev);
>-	smp_wmb();
>-	dev->ip_ptr = in_dev;
> 
> #ifdef CONFIG_SYSCTL
> 	devinet_sysctl_register(in_dev, &in_dev->cnf);
>@@ -168,6 +166,9 @@
> 	if (dev->flags & IFF_UP)
> 		ip_mc_up(in_dev);
> out:
>+	/* we can receive as soon as ip_ptr is set -- do this last */
>+	smp_wmb();
>+	dev->ip_ptr = in_dev;
> 	return in_dev;
> out_kfree:
> 	kfree(in_dev);
>Index: linux-2.6.9-67.0.20.EL/net/ipv6/addrconf.c
>===================================================================
>--- linux-2.6.9-67.0.20.EL.orig/net/ipv6/addrconf.c	2008-07-01 16:00:15.000000000 +0100
>+++ linux-2.6.9-67.0.20.EL/net/ipv6/addrconf.c	2008-07-25 09:58:17.000000000 +0100
>@@ -429,9 +429,6 @@
> 		if (netif_carrier_ok(dev))
> 			ndev->if_flags |= IF_READY;
> 
>-		write_lock_bh(&addrconf_lock);
>-		dev->ip6_ptr = ndev;
>-		write_unlock_bh(&addrconf_lock);
> 
> 		ipv6_mc_init_dev(ndev);
> 		ndev->tstamp = jiffies;
>@@ -440,6 +437,9 @@
> 			NET_IPV6_NEIGH, "ipv6", &ndisc_ifinfo_sysctl_change);
> 		addrconf_sysctl_register(ndev, &ndev->cnf);
> #endif
>+		write_lock_bh(&addrconf_lock);
>+		dev->ip6_ptr = ndev;
>+		write_unlock_bh(&addrconf_lock);
> 	}
> 	return ndev;
> }

Actions: View | Diff

Attachments on bug 456653: 312638