From: David Miller <davem@davemloft.net>
To: ezk@cs.sunysb.edu
Cc: jeff@garzik.org, linux-kernel@vger.kernel.org,
pcnet32@verizon.net, netdev@vger.kernel.org
Subject: Re: broken PCNET32 in 2.6.24 requires experimental PCNET32_NAPI?
Date: Thu, 18 Oct 2007 21:41:07 -0700 (PDT) [thread overview]
Message-ID: <20071018.214107.21905270.davem@davemloft.net> (raw)
In-Reply-To: <200710190433.l9J4X9vh011890@agora.fsl.cs.sunysb.edu>
From: Erez Zadok <ezk@cs.sunysb.edu>
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;
}
prev parent reply other threads:[~2007-10-19 4:41 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-18 20:54 Erez Zadok
2007-10-18 20:58 ` Jeff Garzik
2007-10-19 4:33 ` Erez Zadok
2007-10-19 4:41 ` David Miller [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071018.214107.21905270.davem@davemloft.net \
--to=davem@davemloft.net \
--cc=ezk@cs.sunysb.edu \
--cc=jeff@garzik.org \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pcnet32@verizon.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®