diff options
| author | Patrick McHardy <kaber@trash.net> | 2006-07-25 02:31:14 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-08-06 20:52:13 -0700 |
| commit | 4f40508af128fc5ead71aab6e9932039d2a07fd4 (patch) | |
| tree | 40e983c2051c5d6db21f48d8b6325f2514312408 | |
| parent | 7e92c4788d4bbc03d00553dda3c3572b33ae0d2b (diff) | |
| download | linux-stable-4f40508af128fc5ead71aab6e9932039d2a07fd4.tar.gz linux-stable-4f40508af128fc5ead71aab6e9932039d2a07fd4.tar.bz2 linux-stable-4f40508af128fc5ead71aab6e9932039d2a07fd4.zip | |
H.323 helper: fix possible NULL-ptr dereference
[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: Greg Kroah-Hartman <gregkh@suse.de>
| -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 518f581d39ec..853a3d512c60 100644 --- a/net/ipv4/netfilter/ip_conntrack_helper_h323.c +++ b/net/ipv4/netfilter/ip_conntrack_helper_h323.c @@ -1092,7 +1092,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; } |