netdev - Re: [PATCH] ipv4: fix a bug in ping

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-Id: <20130221.152610.421537041196809390.davem@davemloft.net>
Date:	Thu, 21 Feb 2013 15:26:10 -0500 (EST)
From:	David Miller <davem@...emloft.net>
To:	lw@...fujitsu.com
Cc:	netdev@...r.kernel.org
Subject: Re: [PATCH] ipv4: fix a bug in ping_err().

From: David Miller <davem@...emloft.net>
Date: Thu, 21 Feb 2013 13:08:09 -0500 (EST)

> From: Li Wei <lw@...fujitsu.com>
> Date: Thu, 21 Feb 2013 18:09:54 +0800
> 
>> We should get 'type' and 'code' from the outer ICMP header.
>> 
>> Signed-off-by: Li Wei <lw@...fujitsu.com>
>> ---
>>  net/ipv4/ping.c | 4 ++--
>>  1 file changed, 2 insertions(+), 2 deletions(-)
>> 
>> diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c
>> index 55c4ee1..2e91006 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;
> 
> Isn't that the same thing at this point?  skb->data points to the
> outer IPv4 header at this point, doesn't it?

Answering myself...

Obviously it isn't, ip_rcv() __skb_pull()'s the IP header before it
calls down into ICMP, so we have to use the transport header here.

Applied and queued up for -stable, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html