diff options
| author | Krzysztof Piotr Oledzki <ole@ans.pl> | 2005-11-09 16:04:08 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2005-11-09 16:04:08 -0500 |
| commit | 439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11 (patch) | |
| tree | f4d99b79ea24ec2b9c65165d0c4528058cee1f35 /net/ipv4 | |
| parent | a856a19a9f3ee14fc0d555470f3af138aeb0245c (diff) | |
[NETFILTER] 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: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4')
| -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 9481d159acb6..083951e20690 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[], | |||
| 296 | struct ip_conntrack_tuple *tuple) | 296 | struct ip_conntrack_tuple *tuple) |
| 297 | { | 297 | { |
| 298 | if (!tb[CTA_PROTO_ICMP_TYPE-1] | 298 | if (!tb[CTA_PROTO_ICMP_TYPE-1] |
| 299 | || !tb[CTA_PROTO_ICMP_CODE-1]) | 299 | || !tb[CTA_PROTO_ICMP_CODE-1] |
| 300 | || !tb[CTA_PROTO_ICMP_ID-1]) | ||
| 300 | return -1; | 301 | return -1; |
| 301 | 302 | ||
| 302 | tuple->dst.u.icmp.type = | 303 | tuple->dst.u.icmp.type = |