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

Commit 5703728a authored by Mi Jinlong's avatar Mi Jinlong Committed by J. Bruce Fields
Browse files

nfs: fix bug about IPv6 address scope checking 



The result from ipv6_addr_scope() is a set of flags, not a single value,
so we can't just compare the result with  IPV6_ADDR_SCOPE_LINKLOCAL.

This patch fixs the problem, and checks for unequal addresses before
scope_id.

Signed-off-by: default avatarMi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: default avatarJ. Bruce Fields <bfields@redhat.com>
parent b6d2f1ca

fs/nfs/client.c

+4 −3
Original line number Diff line number Diff line
@@ -336,11 +336,12 @@ static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1, 
	const struct sockaddr_in6 *sin1 = (const struct sockaddr_in6 *)sa1;

	const struct sockaddr_in6 *sin2 = (const struct sockaddr_in6 *)sa2;



	if (ipv6_addr_scope(&sin1->sin6_addr) == IPV6_ADDR_SCOPE_LINKLOCAL &&

	    sin1->sin6_scope_id != sin2->sin6_scope_id)

	if (!ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr))

		return 0;

	else if (ipv6_addr_type(&sin1->sin6_addr) & IPV6_ADDR_LINKLOCAL)

		return sin1->sin6_scope_id == sin2->sin6_scope_id;



	return ipv6_addr_equal(&sin1->sin6_addr, &sin2->sin6_addr);

	return 1;

}

#else	/* !defined(CONFIG_IPV6) && !defined(CONFIG_IPV6_MODULE) */

static int nfs_sockaddr_match_ipaddr6(const struct sockaddr *sa1,