diff options
| author | Mi Jinlong <mijinlong@cn.fujitsu.com> | 2011-10-12 15:09:34 +0800 |
|---|---|---|
| committer | J. Bruce Fields <bfields@redhat.com> | 2011-10-12 10:30:29 -0400 |
| commit | 5703728ac1194baee554163180415baf4ccd9996 (patch) | |
| tree | 721eff2e021212310ebb22518c7b0d3d8a5bf1cc /fs/nfs | |
| parent | b6d2f1ca3c1162f51098969e9c52fd099720416a (diff) | |
| download | linux-5703728ac1194baee554163180415baf4ccd9996.tar.gz linux-5703728ac1194baee554163180415baf4ccd9996.tar.bz2 linux-5703728ac1194baee554163180415baf4ccd9996.zip | |
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: Mi Jinlong <mijinlong@cn.fujitsu.com>
Signed-off-by: J. Bruce Fields <bfields@redhat.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/client.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/nfs/client.c b/fs/nfs/client.c index 5833fbbf59b0..b4e41dd4d0f6 100644 --- a/fs/nfs/client.c +++ b/fs/nfs/client.c @@ -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, |