From: Krzysztof Piotr Oledzki Date: Wed, 9 Nov 2005 21:04:08 +0000 (-0800) Subject: [NETFILTER] ctnetlink: Fix oops when no ICMP ID info in message X-Git-Tag: v2.6.15-rc1~60^2~3 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=439a9994bb6ae3c7cab1f0b776bca6bc7aa58a11;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git [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 Signed-off-by: Pablo Neira Ayuso Signed-off-by: Harald Welte Signed-off-by: David S. Miller --- diff --git a/net/ipv4/netfilter/ip_conntrack_proto_icmp.c b/net/ipv4/netfilter/ip_conntrack_proto_icmp.c index 9481d15..083951e 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 =