projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'from-linus' into upstream
[powerpc.git]
/
net
/
ipv4
/
netfilter
/
ip_conntrack_helper_h323.c
diff --git
a/net/ipv4/netfilter/ip_conntrack_helper_h323.c
b/net/ipv4/netfilter/ip_conntrack_helper_h323.c
index
2c2fb70
..
518f581
100644
(file)
--- a/
net/ipv4/netfilter/ip_conntrack_helper_h323.c
+++ b/
net/ipv4/netfilter/ip_conntrack_helper_h323.c
@@
-162,6
+162,8
@@
static int get_tpkt_data(struct sk_buff **pskb, struct ip_conntrack *ct,
/* Validate TPKT length */
tpktlen = tpkt[2] * 256 + tpkt[3];
+ if (tpktlen < 4)
+ goto clear_out;
if (tpktlen > tcpdatalen) {
if (tcpdatalen == 4) { /* Separate TPKT header */
/* Netmeeting sends TPKT header and data separately */