Commit a21be1f5 authored by Shyam Prasad N's avatar Shyam Prasad N Committed by Steve French
Browse files

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: default avatarShyam Prasad N <sprasad@microsoft.com>
Signed-off-by: default avatarSteve French <stfrench@microsoft.com>
parent 4bd3e4c7

fs/cifs/connect.c

+2 −1
Original line number Diff line number Diff line
@@ -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);