From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 327003E3C42 for ; Thu, 19 Mar 2026 15:40:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773934859; cv=none; b=TWRxungfYbQrEKUBPY20eewuOhUxOKIpeL2pjRElxSdzLrrz+pBcKt32sGammokPvUZjjIN3QXWGBiYmCHDM3lAgNXqQgwEO2rbLfervybGDyLLj6AUP1/hiEYBkskgI91PJBKS2JKWZz/QGMo3Hk4Mx6o753p4rOcipd4IXhcI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773934859; c=relaxed/simple; bh=BjFXgfORwE7NgmtOs7sR+j+yAf7ZU6/jbIiBSF1clMw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=q7V5Di1QfukUEe+uwjFm5j0BVaZPqvMu7j1A3osvOsnu/jE6HrjRKKm+lnDYf12vDkCIpTch3TCyAQUB3fE7JwzuHUTA0AsDVcPloN78ECOo0AAq4rZtsK9tnHa2e65f5zQBA3PmZiXV4vJEKgI5sejHc23MbmqXnFjVvDRdjus= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=vBvAthss; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="vBvAthss" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 575DDC19425; Thu, 19 Mar 2026 15:40:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1773934859; bh=BjFXgfORwE7NgmtOs7sR+j+yAf7ZU6/jbIiBSF1clMw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vBvAthssynp6p9Rmto0wRM5OVmZhnOZG/gXkv1pssRZeD1XR0H+MA/O9TtNVKQLtQ 9JuAxPuDkfgjhrN2EqzhtSgq/ntF5H77VO+YTmzu+jZHb48aVyPhoGFplqZyIDePQx mqM9Qaxt7tmHDktAOGUz8Kfy04EtSN4yGUJJDnmv6ItWrPZDv7T3Bx7Zo8JPQAj0+W wq5uNHFGvibHvYPJl5zzb4GUD7mhC8Y1NtFhY4uARmmvNyD4sJF32q62xvobzQaKuy PlinEuw41D9HSkealpZuHV+0Mg3Og5Bcjf8kKV35Pe2cBMJXZVkHKTM38kdoKrCP55 vMzbnY56Im4ng== From: Sasha Levin To: stable@vger.kernel.org Cc: Henrique Carvalho , "Dr. Thomas Orgis" , Enzo Matsumiya , Steve French , Sasha Levin Subject: [PATCH 5.15.y 2/2] smb: client: fix iface port assignment in parse_server_interfaces Date: Thu, 19 Mar 2026 11:40:55 -0400 Message-ID: <20260319154055.2633432-2-sashal@kernel.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260319154055.2633432-1-sashal@kernel.org> References: <2026031729-brethren-snowshoe-607a@gregkh> <20260319154055.2633432-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Henrique Carvalho [ Upstream commit d4c7210d2f3ea481a6481f03040a64d9077a6172 ] parse_server_interfaces() initializes interface socket addresses with CIFS_PORT. When the mount uses a non-default port this overwrites the configured destination port. Later, cifs_chan_update_iface() copies this sockaddr into server->dstaddr, causing reconnect attempts to use the wrong port after server interface updates. Use the existing port from server->dstaddr instead. Cc: stable@vger.kernel.org Fixes: fe856be475f7 ("CIFS: parse and store info on iface queries") Tested-by: Dr. Thomas Orgis Reviewed-by: Enzo Matsumiya Signed-off-by: Henrique Carvalho Signed-off-by: Steve French [ Different paths, some minor API diffs ] Signed-off-by: Sasha Levin --- fs/cifs/smb2ops.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/fs/cifs/smb2ops.c b/fs/cifs/smb2ops.c index 619905fc694e4..bb56cd4e134ae 100644 --- a/fs/cifs/smb2ops.c +++ b/fs/cifs/smb2ops.c @@ -498,6 +498,7 @@ smb3_negotiate_rsize(struct cifs_tcon *tcon, struct smb3_fs_context *ctx) static int parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, size_t buf_len, + struct cifs_ses *ses, struct cifs_server_iface **iface_list, size_t *iface_count) { @@ -507,6 +508,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, struct iface_info_ipv4 *p4; struct iface_info_ipv6 *p6; struct cifs_server_iface *info; + __be16 port; ssize_t bytes_left; size_t next = 0; int nb_iface = 0; @@ -553,6 +555,15 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, goto out; } + spin_lock(&cifs_tcp_ses_lock); + if (ses->server->dstaddr.ss_family == AF_INET) + port = ((struct sockaddr_in *)&ses->server->dstaddr)->sin_port; + else if (ses->server->dstaddr.ss_family == AF_INET6) + port = ((struct sockaddr_in6 *)&ses->server->dstaddr)->sin6_port; + else + port = cpu_to_be16(CIFS_PORT); + spin_unlock(&cifs_tcp_ses_lock); + info = *iface_list; bytes_left = buf_len; p = buf; @@ -579,7 +590,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, memcpy(&addr4->sin_addr, &p4->IPv4Address, 4); /* [MS-SMB2] 2.2.32.5.1.1 Clients MUST ignore these */ - addr4->sin_port = cpu_to_be16(CIFS_PORT); + addr4->sin_port = port; cifs_dbg(FYI, "%s: ipv4 %pI4\n", __func__, &addr4->sin_addr); @@ -593,7 +604,7 @@ parse_server_interfaces(struct network_interface_info_ioctl_rsp *buf, /* [MS-SMB2] 2.2.32.5.1.2 Clients MUST ignore these */ addr6->sin6_flowinfo = 0; addr6->sin6_scope_id = 0; - addr6->sin6_port = cpu_to_be16(CIFS_PORT); + addr6->sin6_port = port; cifs_dbg(FYI, "%s: ipv6 %pI6\n", __func__, &addr6->sin6_addr); @@ -660,7 +671,7 @@ SMB3_request_interfaces(const unsigned int xid, struct cifs_tcon *tcon) goto out; } - rc = parse_server_interfaces(out_buf, ret_data_len, + rc = parse_server_interfaces(out_buf, ret_data_len, ses, &iface_list, &iface_count); if (rc) goto out; -- 2.51.0