| Message ID | 1362052772-21098-1-git-send-email-luis.henriques@canonical.com |
|---|---|
| State | New |
| Headers | show |
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index 2c00e8b..79db4e5 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -328,8 +328,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;
This is a note to let you know that I have just added a patch titled ipv4: fix a bug in ping_err(). to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue If you, or anyone else, feels it should not be added to this tree, please reply to this email. For more information about the 3.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Luis ------ From 537514d212ff53b00f7067a51d8819950c4bd1b9 Mon Sep 17 00:00:00 2001 From: Li Wei <lw@cn.fujitsu.com> Date: Thu, 21 Feb 2013 00:09:54 +0000 Subject: [PATCH] ipv4: fix a bug in ping_err(). commit b531ed61a2a2a77eeb2f7c88b49aa5ec7d9880d8 upstream. 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: Luis Henriques <luis.henriques@canonical.com> --- net/ipv4/ping.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.8.1.2