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
drm/amd: consolidate TA shared memory structures
[linux-2.6-microblaze.git]
/
net
/
netfilter
/
nf_conntrack_pptp.c
diff --git
a/net/netfilter/nf_conntrack_pptp.c
b/net/netfilter/nf_conntrack_pptp.c
index
5105d42
..
7d5708b
100644
(file)
--- a/
net/netfilter/nf_conntrack_pptp.c
+++ b/
net/netfilter/nf_conntrack_pptp.c
@@
-544,7
+544,9
@@
conntrack_pptp_help(struct sk_buff *skb, unsigned int protoff,
nexthdr_off = protoff;
tcph = skb_header_pointer(skb, nexthdr_off, sizeof(_tcph), &_tcph);
- BUG_ON(!tcph);
+ if (!tcph)
+ return NF_ACCEPT;
+
nexthdr_off += tcph->doff * 4;
datalen = tcplen - tcph->doff * 4;