diff options
| author | Krzysztof Piotr Oledzki <ole@ans.pl> | 2005-11-23 07:59:21 +0100 |
|---|---|---|
| committer | Chris Wright <chrisw@osdl.org> | 2005-11-24 14:10:10 -0800 |
| commit | ae77af5fdb07f075c3b833cc378f92dcf361627e (patch) | |
| tree | 9823076913482a582d88c5dd178d075092f2d5fd | |
| parent | e9e2c792141e83778cc46eb501fc13b786f26263 (diff) | |
[PATCH] ctnetlink: Fix oops when no ICMP ID info in message
This patch fixes an userspace triggered oops. If there is no ICMP_ID
info the reference to attr will be NULL.
Signed-off-by: Krzysztof Piotr Oledzki <ole@ans.pl>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Signed-off-by: Harald Welte <laforge@netfilter.org>
Signed-off-by: Chris Wright <chrisw@osdl.org>
| -rw-r--r-- | net/ipv4/netfilter/ip_conntrack_proto_icmp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 98f0015dd255..838d1d69b36e 100644 --- a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c +++ b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c @@ -296,7 +296,8 @@ static int icmp_nfattr_to_tuple(struct nfattr *tb[], struct ip_conntrack_tuple *tuple) { if (!tb[CTA_PROTO_ICMP_TYPE-1] - || !tb[CTA_PROTO_ICMP_CODE-1]) + || !tb[CTA_PROTO_ICMP_CODE-1] + || !tb[CTA_PROTO_ICMP_ID-1]) return -1; tuple->dst.u.icmp.type = |