ipv4: fix a bug in ping_err().

[ Upstream commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 ]

We should get 'type' and 'code' from the outer ICMP header.

Signed-off-by: Li Wei <lw@cn.fujitsu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 6f9c07268cf6d433379898421e978d74fa49952f..dc454ccc5039a6358b99077250b027c2459566ce 100644 (file)
--- a/net/ipv4/ping.c
+++ b/net/ipv4/ping.c
@@ -322,8 +322,8 @@ void ping_err(struct sk_buff *skb, u32 info)
        struct iphdr *iph = (struct iphdr *)skb->data;
        struct icmphdr *icmph = (struct icmphdr *)(skb->data+(iph->ihl<<2));
        struct inet_sock *inet_sock;
-       int type = icmph->type;
-       int code = icmph->code;
+       int type = icmp_hdr(skb)->type;
+       int code = icmp_hdr(skb)->code;
        struct net *net = dev_net(skb->dev);
        struct sock *sk;
        int harderr;