From: Erez Zadok <[EMAIL PROTECTED]>
Date: Fri, 19 Oct 2007 00:33:09 -0400
> Call Trace:
> [<c0102bc2>] show_trace_log_lvl+0x1a/0x2f
> [<c0102c72>] show_stack_log_lvl+0x9b/0xa3
> [<c0102e2e>] show_registers+0x1b4/0x285
> [<c0102fff>] die+0x100/0x21d
> [<c010a72f>] do_page_fault+0x434/0x515
> [<c026a40a>] error_code+0x6a/0x70
> [<c021ea1b>] sock_setsockopt+0x43f/0x494
> [<c021b994>] sys_setsockopt+0x4f/0x85
> [<c021ce0e>] sys_socketcall+0x1cb/0x222
> [<c0102586>] sysenter_past_esp+0x5f/0x91
This fix from Olof Johnson should fix it.
I'll merge this tonight.
diff --git a/net/core/filter.c b/net/core/filter.c
index 1f0068e..e0a0694 100644
--- a/net/core/filter.c
+++ b/net/core/filter.c
@@ -447,7 +447,8 @@ int sk_attach_filter(struct sock_fprog *fprog, struct sock
*sk)
rcu_assign_pointer(sk->sk_filter, fp);
rcu_read_unlock_bh();
- sk_filter_delayed_uncharge(sk, old_fp);
+ if (old_fp)
+ sk_filter_delayed_uncharge(sk, old_fp);
return 0;
}
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
