| Message ID | 49DCB0E2.2060302@hp.com |
|---|---|
| State | RFC, archived |
| Delegated to: | David Miller |
| Headers | show |
On Wednesday 08 April 2009 10:12:50 Vlad Yasevich wrote: > Ed Tomlinson wrote: > > Hi, > > > > I got tired of rebuilding the drm and radeon modules to support my R600 card so I decided to > > try .30-rc. It lasted about 30 minutes then I got the exception below when start a freenet node. > > > > The ipv6 interface is supplied by www.sixxs.org but my tunnel broker is currently down so aside > > from the local link address on eth0 (and locl) there are no ipv6 intefaces on my box. > > > > Hope this helps, > > Ed Tomlinson > > > > [ 1982.214334] BUG: unable to handle kernel NULL pointer dereference at 0000000000000062 > > [ 1982.215132] IP: [<ffffffff805d7d61>] ipv4_rcv_saddr_equal+0x61/0x70 > > [ 1982.215132] PGD 1495d6067 PUD 0 > > [ 1982.215132] Oops: 0000 [#1] PREEMPT SMP > > [ 1982.215132] last sysfs file: /sys/devices/pci0000:00/0000:00:01.0/0000:01:05.0/enable > > [ 1982.215132] CPU 1 > > [ 1982.215132] Modules linked in: btrfs zlib_deflate zlib_inflate crc32c libcrc32c radeon drm bridge stp rfcomm llc bnep l2cap bluet] > > [ 1982.338205] Pid: 21779, comm: java Not tainted 2.6.30-rc1-crc #1 System Product Name > > [ 1982.338205] RIP: 0010:[<ffffffff805d7d61>] [<ffffffff805d7d61>] ipv4_rcv_saddr_equal+0x61/0x70 > > [ 1982.338205] RSP: 0018:ffff880122d21d28 EFLAGS: 00010246 > > [ 1982.338205] RAX: 0000000000000000 RBX: 0000000000001000 RCX: 00000000000e1000 > > [ 1982.338205] RDX: 0000000000000000 RSI: ffff8801250da840 RDI: ffff880147cf8000 > > [ 1982.338205] RBP: ffff880122d21d38 R08: 0000000000000000 R09: 000000000100007f > > [ 1982.338205] R10: ffff88015f4a85c8 R11: 0000000000000001 R12: ffff8801250da840 > > [ 1982.338205] R13: ffff8801250da8d8 R14: 0000000000000000 R15: ffff880147cf8000 > > [ 1982.338205] FS: 00007f2da29f6950(0000) GS:ffff880028059000(0000) knlGS:0000000000000000 > > [ 1982.338205] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 > > [ 1982.338205] CR2: 0000000000000062 CR3: 000000013f1f1000 CR4: 00000000000006e0 > > [ 1982.338205] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000 > > [ 1982.338205] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400 > > [ 1982.338205] Process java (pid: 21779, threadinfo ffff880122d20000, task ffff8801310ec4a0) > > [ 1982.840593] Stack: > > [ 1982.840593] ffff880122d21d58 0000000057ae6420 ffff880122d21d98 ffffffffa033847b > > [ 1982.847599] 0000000000007918 00000000805bafe5 ffff880147cf85a8 00000000ffffffff > > [ 1982.847599] 0000000057ae6420 ffff8801250da858 ffff880147cf8000 ffff88015f279180 > > [ 1982.847599] Call Trace: > > [ 1982.847599] [<ffffffffa033847b>] ipv6_rcv_saddr_equal+0x1bb/0x250 [ipv6] > > [ 1982.847599] [<ffffffffa03505a8>] inet6_csk_bind_conflict+0x88/0xd0 [ipv6] > > [ 1982.847599] [<ffffffff805bb18e>] inet_csk_get_port+0x1ee/0x400 > > [ 1982.847599] [<ffffffffa0319b7f>] inet6_bind+0x1cf/0x3a0 [ipv6] > > [ 1982.847599] [<ffffffff8056d17c>] ? sockfd_lookup_light+0x3c/0xd0 > > [ 1982.847599] [<ffffffff8056ed49>] sys_bind+0x89/0x100 > > [ 1982.847599] [<ffffffff80613ea2>] ? trace_hardirqs_on_thunk+0x3a/0x3c > > [ 1982.847599] [<ffffffff8020bf9b>] system_call_fastpath+0x16/0x1b > > [ 1982.847599] Code: 39 c2 0f 94 c0 0f b6 d0 eb 05 ba 01 00 00 00 89 d0 48 8b 55 f8 65 48 33 14 25 28 00 00 00 75 14 c9 c3 48 8b 86 > > [ 1982.847599] RIP [<ffffffff805d7d61>] ipv4_rcv_saddr_equal+0x61/0x70 > > [ 1982.847599] RSP <ffff880122d21d28> > > [ 1982.847599] CR2: 0000000000000062 > > [ 1983.173477] ---[ end trace a12cea0f8928336a ]--- > > [ 1983.187700] Kernel panic - not syncing: Fatal exception in interrupt > > [ 1983.207275] Pid: 21779, comm: java Tainted: G D 2.6.30-rc1-crc #1 > > [ 1983.228189] Call Trace: > > [ 1983.235712] [<ffffffff8060f5a1>] panic+0xc1/0x190 > > [ 1983.250470] [<ffffffff8020c96d>] ? restore_args+0x0/0x30 > > [ 1983.267104] [<ffffffff80252fcb>] ? oops_exit+0x3b/0x60 > > [ 1983.283201] [<ffffffff80616046>] oops_end+0xb6/0xd0 > > [ 1983.283205] [<ffffffff80230970>] no_context+0x110/0x290 > > [ 1983.283208] [<ffffffff80230c7d>] __bad_area_nosemaphore+0x18d/0x230 > > [ 1983.283212] [<ffffffff80618129>] ? sub_preempt_count+0x69/0x70 > > [ 1983.283216] [<ffffffff8061468a>] ? _spin_lock_irqsave+0x3a/0x70 > > > > Thanks for letting us know. I am testing a patch right now. Give it a try > when you get a chance. It it works correctly, I'll resubmit with attribution. I have been running a script to start and stop freenet every 10 minutes. Its been going over 10 hours without problem. Think this has fixed the problem. ACK Ed Tomlinson <edt@aei.ca> Thanks Ed -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/include/net/udp.h b/include/net/udp.h index 93dbe29..90e6ce5 100644 --- a/include/net/udp.h +++ b/include/net/udp.h @@ -124,8 +124,6 @@ static inline void udp_lib_close(struct sock *sk, long timeout) sk_common_release(sk); } -extern int ipv4_rcv_saddr_equal(const struct sock *sk1, - const struct sock *sk2); extern int udp_lib_get_port(struct sock *sk, unsigned short snum, int (*)(const struct sock*,const struct sock*)); diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c index bda08a0..7a1d1ce 100644 --- a/net/ipv4/udp.c +++ b/net/ipv4/udp.c @@ -222,7 +222,7 @@ fail: return error; } -int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) +static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) { struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); @@ -1823,7 +1823,6 @@ EXPORT_SYMBOL(udp_lib_getsockopt); EXPORT_SYMBOL(udp_lib_setsockopt); EXPORT_SYMBOL(udp_poll); EXPORT_SYMBOL(udp_lib_get_port); -EXPORT_SYMBOL(ipv4_rcv_saddr_equal); #ifdef CONFIG_PROC_FS EXPORT_SYMBOL(udp_proc_register); diff --git a/net/ipv6/udp.c b/net/ipv6/udp.c index 6842dd2..5ed54af 100644 --- a/net/ipv6/udp.c +++ b/net/ipv6/udp.c @@ -53,6 +53,8 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) { const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); + __be32 sk_rcv_saddr = inet_sk(sk)->rcv_saddr; + __be32 sk2_rcv_saddr = inet_rcv_saddr(sk2); int sk_ipv6only = ipv6_only_sock(sk); int sk2_ipv6only = inet_v6_ipv6only(sk2); int addr_type = ipv6_addr_type(sk_rcv_saddr6); @@ -60,7 +62,9 @@ int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) /* if both are mapped, treat as IPv4 */ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) - return ipv4_rcv_saddr_equal(sk, sk2); + return (!sk2_ipv6only && + (!sk_rcv_saddr || !sk2_rcv_saddr || + sk_rcv_saddr == sk2_rcv_saddr)); if (addr_type2 == IPV6_ADDR_ANY && !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED))