| From 91a0b603469069cdcce4d572b7525ffc9fd352a6 Mon Sep 17 00:00:00 2001 |
| From: Jane Zhou <a17711@motorola.com> |
| Date: Mon, 24 Nov 2014 11:44:08 -0800 |
| Subject: net/ping: handle protocol mismatching scenario |
| |
| From: Jane Zhou <a17711@motorola.com> |
| |
| commit 91a0b603469069cdcce4d572b7525ffc9fd352a6 upstream. |
| |
| ping_lookup() may return a wrong sock if sk_buff's and sock's protocols |
| dont' match. For example, sk_buff's protocol is ETH_P_IPV6, but sock's |
| sk_family is AF_INET, in that case, if sk->sk_bound_dev_if is zero, a wrong |
| sock will be returned. |
| the fix is to "continue" the searching, if no matching, return NULL. |
| |
| Cc: "David S. Miller" <davem@davemloft.net> |
| Cc: Alexey Kuznetsov <kuznet@ms2.inr.ac.ru> |
| Cc: James Morris <jmorris@namei.org> |
| Cc: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org> |
| Cc: Patrick McHardy <kaber@trash.net> |
| Cc: netdev@vger.kernel.org |
| Signed-off-by: Jane Zhou <a17711@motorola.com> |
| Signed-off-by: Yiwei Zhao <gbjc64@motorola.com> |
| Signed-off-by: David S. Miller <davem@davemloft.net> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| net/ipv4/ping.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/net/ipv4/ping.c |
| +++ b/net/ipv4/ping.c |
| @@ -217,6 +217,8 @@ static struct sock *ping_lookup(struct n |
| &ipv6_hdr(skb)->daddr)) |
| continue; |
| #endif |
| + } else { |
| + continue; |
| } |
| |
| if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif) |
