diff options
| author | Shyam Prasad N <sprasad@microsoft.com> | 2022-12-27 14:04:29 +0000 |
|---|---|---|
| committer | Steve French <stfrench@microsoft.com> | 2023-03-01 18:18:24 -0600 |
| commit | a21be1f5df85831147d5a1cbb5f2a13ec8c6852b (patch) | |
| tree | cec4bdf33b4fabe362c00238bbf5d2b7ca9ad323 /fs | |
| parent | 4bd3e4c7e4e552aa148edd3f2a2326ccc3011122 (diff) | |
| download | linux-stable-a21be1f5df85831147d5a1cbb5f2a13ec8c6852b.tar.gz linux-stable-a21be1f5df85831147d5a1cbb5f2a13ec8c6852b.tar.bz2 linux-stable-a21be1f5df85831147d5a1cbb5f2a13ec8c6852b.zip | |
cifs: match even the scope id for ipv6 addresses
match_address function matches the scope id for ipv6 addresses,
but cifs_match_ipaddr (which is another function used for comparison)
does not use scope id. Doing so with this change.
Signed-off-by: Shyam Prasad N <sprasad@microsoft.com>
Signed-off-by: Steve French <stfrench@microsoft.com>
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/cifs/connect.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index ec020d860be3..5dabd8dc3e8e 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1294,7 +1294,8 @@ cifs_match_ipaddr(struct sockaddr *srcaddr, struct sockaddr *rhs) case AF_INET6: { struct sockaddr_in6 *saddr6 = (struct sockaddr_in6 *)srcaddr; struct sockaddr_in6 *vaddr6 = (struct sockaddr_in6 *)rhs; - return ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr); + return (ipv6_addr_equal(&saddr6->sin6_addr, &vaddr6->sin6_addr) + && saddr6->sin6_scope_id == vaddr6->sin6_scope_id); } default: WARN_ON(1); |