net/ping: handle protocol mismatching scenario
authorJane Zhou <a17711@motorola.com>
Mon, 24 Nov 2014 19:44:08 +0000 (11:44 -0800)
committerJP Abgrall <jpa@google.com>
Tue, 2 Dec 2014 02:28:04 +0000 (02:28 +0000)
commit78a68094b2498c7b3644b3acbb523b1ff6f0c488
tree3e8f2acffb06d48efbf952184f9990f3c4b616cc
parentb2a582d102c4deb9e6a34f784e0700f642c50e8a
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>
Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
net/ipv4/ping.c