diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-07-25 07:52:10 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-07-25 07:52:10 +0200 |
| commit | 083edca05ab1fa6efac1ba414018f7f45a4a83ff (patch) | |
| tree | d135d53781c13afb23dcfe8576e37edff2224406 /net | |
| parent | [NET]: Correct dev_alloc_skb kerneldoc (diff) | |
| download | linux-083edca05ab1fa6efac1ba414018f7f45a4a83ff.tar.xz linux-083edca05ab1fa6efac1ba414018f7f45a4a83ff.zip | |
[NETFILTER]: H.323 helper: fix possible NULL-ptr dereference
An RCF message containing a timeout results in a NULL-ptr dereference if
no RRQ has been seen before.
Noticed by the "SATURN tool", reported by Thomas Dillig <tdillig@stanford.edu>
and Isil Dillig <isil@stanford.edu>.
Signed-off-by: Patrick McHardy <kaber@trash.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_helper_h323.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_helper_h323.c b/net/ipv4/netfilter/ip_conntrack_helper_h323.c index af35235672d5..9a39e2969712 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c @@ -1200,7 +1200,7 @@ static struct ip_conntrack_expect *find_expect(struct ip_conntrack *ct, tuple.dst.protonum = IPPROTO_TCP; exp = __ip_conntrack_expect_find(&tuple); - if (exp->master == ct) + if (exp && exp->master == ct) return exp; return NULL; } |