diff options
| author | Jane Zhou <a17711@motorola.com> | 2014-11-24 11:44:08 -0800 |
|---|---|---|
| committer | Ziyan <jaraidaniel@gmail.com> | 2015-04-11 23:02:44 +0200 |
| commit | 3c1c8130ab53347a16d1024fab35627e47acb4d7 (patch) | |
| tree | 39fffe7e4d3fba3eb681d91128572779b522b438 /net | |
| parent | ea168ae3b076cb687bc35e7d3ca7189c4dbffc96 (diff) | |
| download | kernel_samsung_tuna-3c1c8130ab53347a16d1024fab35627e47acb4d7.zip kernel_samsung_tuna-3c1c8130ab53347a16d1024fab35627e47acb4d7.tar.gz kernel_samsung_tuna-3c1c8130ab53347a16d1024fab35627e47acb4d7.tar.bz2 | |
net/ping: handle protocol mismatching scenario
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.
[cherry-pick of net 91a0b603469069cdcce4d572b7525ffc9fd352a6]
Bug: 18512516
Change-Id: I520223ce53c0d4e155c37d6b65a03489cc7fd494
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
Cc: stable@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>
Diffstat (limited to 'net')
| -rw-r--r-- | net/ipv4/ping.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/ipv4/ping.c b/net/ipv4/ping.c index b79fa52..3f820c3 100644 --- a/net/ipv4/ping.c +++ b/net/ipv4/ping.c @@ -212,6 +212,8 @@ static struct sock *ping_lookup(struct net *net, struct sk_buff *skb, u16 ident) &ipv6_hdr(skb)->daddr)) continue; #endif + } else { + continue; } if (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif) |