Commit e1871bab authored Jan 20, 2016 by Eric Dumazet Committed by Subash Abhinov Kasiviswanathan May 18, 2016

net: diag: support v4mapped sockets in inet_diag_find_one_icsk()



Lorenzo reported that we could not properly find v4mapped sockets
in inet_diag_find_one_icsk(). This patch fixes the issue.

[Cherry-pick of net 7c1306723ee916ea9f1fa7d9e4c7a6d029ca7aaf]

CRs-fixed: 1009682
Change-Id: Ie0f5b78b15f30f375bb6f8aadf2104109a10031c
Reported-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: Eric Dumazet <edumazet@google.com>
Acked-by: Lorenzo Colitti <lorenzo@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Git-commit: e603010c
Git-repo: https://android.googlesource.com/kernel/common/


Signed-off-by: Jerome Stanislaus <jeromes@codeaurora.org>

parent 868d8dae

net/ipv4/inet_diag.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -315,6 +315,12 @@ struct sock inet_diag_find_one_icsk(struct net net,
		}
		#if IS_ENABLED(CONFIG_IPV6)
		else if (req->sdiag_family == AF_INET6) {
		if (ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_dst) &&
		ipv6_addr_v4mapped((struct in6_addr *)req->id.idiag_src))
		sk = inet_lookup(net, hashinfo, req->id.idiag_dst[3],
		req->id.idiag_dport, req->id.idiag_src[3],
		req->id.idiag_sport, req->id.idiag_if);
		else
		sk = inet6_lookup(net, hashinfo,
		(struct in6_addr *)req->id.idiag_dst,
		req->id.idiag_dport,