Prev: [119/205] ARM: 6226/1: fix kprobe bug in ldr instruction emulation
Next: [075/205] netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT
From: Greg KH on 30 Jul 2010 14:30
2.6.34-stable review patch. If anyone has any objections, please let us know.

------------------

From: stephen hemminger <shemminger(a)vyatta.com>

commit 9f888160bdcccf0565dd2774956b8d9456e610be upstream.

The addition of TLLAO option created a kernel OOPS regression
for the case where neighbor advertisement is being sent via
proxy path. When using proxy, ipv6_get_ifaddr() returns NULL
causing the NULL dereference.

Change causing the bug was:
commit f7734fdf61ec6bb848e0bafc1fb8bad2c124bb50
Author: Octavian Purdila <opurdila(a)ixiacom.com>
Date: Fri Oct 2 11:39:15 2009 +0000

make TLLAO option for NA packets configurable

Signed-off-by: Stephen Hemminger <shemminger(a)vyatta.com>
Acked-by: YOSHIFUJI Hideaki <yoshfuji(a)linux-ipv6.org>
Signed-off-by: David S. Miller <davem(a)davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh(a)suse.de>

---
net/ipv6/ndisc.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

--- a/net/ipv6/ndisc.c
+++ b/net/ipv6/ndisc.c
@@ -586,6 +586,7 @@ static void ndisc_send_na(struct net_dev
src_addr = solicited_addr;
if (ifp->flags & IFA_F_OPTIMISTIC)
override = 0;
+ inc_opt |= ifp->idev->cnf.force_tllao;
in6_ifa_put(ifp);
} else {
if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr,
@@ -599,7 +600,6 @@ static void ndisc_send_na(struct net_dev
icmp6h.icmp6_solicited = solicited;
icmp6h.icmp6_override = override;

- inc_opt |= ifp->idev->cnf.force_tllao;
__ndisc_send(dev, neigh, daddr, src_addr,
&icmp6h, solicited_addr,
inc_opt ? ND_OPT_TARGET_LL_ADDR : 0);


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: [119/205] ARM: 6226/1: fix kprobe bug in ldr instruction emulation
Next: [075/205] netfilter: ip6t_REJECT: fix a dst leak in ipv6 REJECT