If we have a share mounted by non-standard port and try to mount another share on the same host with standard port, we connect to the first share again - that's wrong. This patch fixes this bug.
Signed-off-by: Pavel Shilovsky <[email protected]> --- fs/cifs/connect.c | 37 +++++++++++++++++++++++++++++++------ 1 files changed, 31 insertions(+), 6 deletions(-) diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c index 01ebcc4..7130dd7 100644 --- a/fs/cifs/connect.c +++ b/fs/cifs/connect.c @@ -1435,6 +1435,34 @@ srcip_matches(struct sockaddr *srcaddr, struct sockaddr *rhs) } } +static bool +match_port(struct TCP_Server_Info *server, struct sockaddr *addr) +{ + struct sockaddr_in *addr4 = (struct sockaddr_in *)addr; + struct sockaddr_in6 *addr6 = (struct sockaddr_in6 *)addr; + unsigned short int port; + + /* search for a connection with the default port if user doesn't + specify the port manually */ + port = htons(CIFS_PORT); + + switch (addr->sa_family) { + case AF_INET: + if (addr4->sin_port) + port = addr4->sin_port; + if (port != server->addr.sockAddr.sin_port) + return false; + break; + case AF_INET6: + if (addr6->sin6_port) + port = addr6->sin6_port; + if (port != server->addr.sockAddr6.sin6_port) + return false; + break; + } + + return true; +} static bool match_address(struct TCP_Server_Info *server, struct sockaddr *addr, @@ -1448,9 +1476,6 @@ match_address(struct TCP_Server_Info *server, struct sockaddr *addr, if (addr4->sin_addr.s_addr != server->addr.sockAddr.sin_addr.s_addr) return false; - if (addr4->sin_port && - addr4->sin_port != server->addr.sockAddr.sin_port) - return false; break; case AF_INET6: if (!ipv6_addr_equal(&addr6->sin6_addr, @@ -1459,9 +1484,6 @@ match_address(struct TCP_Server_Info *server, struct sockaddr *addr, if (addr6->sin6_scope_id != server->addr.sockAddr6.sin6_scope_id) return false; - if (addr6->sin6_port && - addr6->sin6_port != server->addr.sockAddr6.sin6_port) - return false; break; } @@ -1530,6 +1552,9 @@ cifs_find_tcp_session(struct sockaddr *addr, struct smb_vol *vol) (struct sockaddr *)&vol->srcaddr)) continue; + if (!match_port(server, addr)) + continue; + if (!match_security(server, vol)) continue; -- 1.7.3.2 -- To unsubscribe from this list: send the line "unsubscribe linux-cifs" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
