Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ce13a3b authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: diag: support v4mapped sockets in inet_diag_find_one_icsk()"

parents 066d2167 e1871bab

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,