aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLi Wei <lw@cn.fujitsu.com>2013-02-21 00:09:54 +0000
committerDavid S. Miller <davem@davemloft.net>2013-02-21 15:25:00 -0500
commitb531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 (patch)
tree7abb06b84175c8ad6ebd5aea3999d7df39e41f3d
parenta0b1c42951dd06ec83cc1bc2c9788131d9fefcd8 (diff)
downloadvexpress-lsk-b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8.tar.gz
ipv4: fix a bug in ping_err().
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>
-rw-r--r--net/ipv4/ping.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
index 55c4ee1bba0..2e91006d607 100644
--- 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;