projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tools headers UAPI: Sync linux/prctl.h with the kernel sources
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nf_conntrack_sane.c
diff --git
a/net/netfilter/nf_conntrack_sane.c
b/net/netfilter/nf_conntrack_sane.c
index
1aebd65
..
fcb33b1
100644
(file)
--- a/
net/netfilter/nf_conntrack_sane.c
+++ b/
net/netfilter/nf_conntrack_sane.c
@@
-95,7
+95,10
@@
static int help(struct sk_buff *skb,
spin_lock_bh(&nf_sane_lock);
sb_ptr = skb_header_pointer(skb, dataoff, datalen, sane_buffer);
spin_lock_bh(&nf_sane_lock);
sb_ptr = skb_header_pointer(skb, dataoff, datalen, sane_buffer);
- BUG_ON(sb_ptr == NULL);
+ if (!sb_ptr) {
+ spin_unlock_bh(&nf_sane_lock);
+ return NF_ACCEPT;
+ }
if (dir == IP_CT_DIR_ORIGINAL) {
if (datalen != sizeof(struct sane_request))
if (dir == IP_CT_DIR_ORIGINAL) {
if (datalen != sizeof(struct sane_request))