From nobody Fri Dec 19 15:15:32 2025 Received: from out-171.mta0.migadu.com (out-171.mta0.migadu.com [91.218.175.171]) (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 0207D30F53D for ; Tue, 14 Oct 2025 07:21:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760426492; cv=none; b=ap7H7+8Kyr73dDYJeaIwhS9MfhmBs3raioWLrjD4+opuJVfEH3ecWV1KbkNTd1l9lHG6Apun3/42pNVB+57jsBEWMtMGWHw0t9mzDIzm935xy4MMvWeBffML6zAbIcWdwtNqHGhOI1rM4M5hutRZP6YXmYHgOc4BwXTR1ZMy7p0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760426492; c=relaxed/simple; bh=h8rXpMFfHIROBKkRmkoCt2Bb21FexDTnSrRb1R1hAAI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M8MjozzrXCbF4Efdo1/fXC4o1v2aSvcAGZNXf50STUMbD+hNC8RXA0xhoGtF9oA6R9a2kKRk7qWVm4cmdgWme+C0tesUjvGYVWOsbQyU/3C07slRR9oi9n0tKRx403t05tZ3xDWtqxjlU8hODimPt5VZp1ONn8wCm+e2bA97+rc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev; spf=pass smtp.mailfrom=linux.dev; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b=CmFQ/67w; arc=none smtp.client-ip=91.218.175.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.dev Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.dev Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linux.dev header.i=@linux.dev header.b="CmFQ/67w" X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.dev; s=key1; t=1760426487; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=rVSnxhMPMOb3VfodAlVGeNsY6CWTbrhUN1aYyuggb0w=; b=CmFQ/67wcVxmkeoUqM16Yc5Jh2zLtKo6vNg6JeSvXQaZ3LqjVjtIOXAaQsFoTqcnApx0Ju rdpmkeDZIo8J5Xpe45rFkARItLx6a0oOEzEmZ2Viuw9hIi6Ktxw0erOX6b38JsfrxHLxVP xXFN4BVmQuBHSmmv3bgRrdw6QhUhNm4= From: chenxiaosong.chenxiaosong@linux.dev To: stfrench@microsoft.com, metze@samba.org, pali@kernel.org, linkinjeon@kernel.org, smfrench@gmail.com, sfrench@samba.org, senozhatsky@chromium.org, tom@talpey.com, pc@manguebit.org, ronniesahlberg@gmail.com, sprasad@microsoft.com, bharathsm@microsoft.com, christophe.jaillet@wanadoo.fr, zhangguodong@kylinos.cn Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, ChenXiaoSong Subject: [PATCH v3 08/22] smb: move smb_sockaddr_in and smb_sockaddr_in6 to common/smb2pdu.h Date: Tue, 14 Oct 2025 15:19:03 +0800 Message-ID: <20251014071917.3004573-9-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251014071917.3004573-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251014071917.3004573-1-chenxiaosong.chenxiaosong@linux.dev> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Migadu-Flow: FLOW_OUT Content-Type: text/plain; charset="utf-8" From: ZhangGuoDong Rename 4 places: - iface_info_ipv4 -> smb_sockaddr_in - iface_info_ipv6 -> smb_sockaddr_in6 - IPv4address -> IPv4Address - IPv6address -> IPv6Address Then move duplicate definitions to common header file. Co-developed-by: ChenXiaoSong Signed-off-by: ChenXiaoSong Signed-off-by: ZhangGuoDong --- fs/smb/client/smb2ops.c | 8 ++++---- fs/smb/client/smb2pdu.h | 13 ------------- fs/smb/common/smb2pdu.h | 15 +++++++++++++++ fs/smb/server/smb2pdu.c | 4 ++-- fs/smb/server/smb2pdu.h | 13 ------------- 5 files changed, 21 insertions(+), 32 deletions(-) diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c index 7c392cf5940b..e90ca77d2ac7 100644 --- a/fs/smb/client/smb2ops.c +++ b/fs/smb/client/smb2ops.c @@ -624,8 +624,8 @@ parse_server_interfaces(struct network_interface_info_i= octl_rsp *buf, struct network_interface_info_ioctl_rsp *p; struct sockaddr_in *addr4; struct sockaddr_in6 *addr6; - struct iface_info_ipv4 *p4; - struct iface_info_ipv6 *p6; + struct smb_sockaddr_in *p4; + struct smb_sockaddr_in6 *p6; struct cifs_server_iface *info =3D NULL, *iface =3D NULL, *niface =3D NUL= L; struct cifs_server_iface tmp_iface; ssize_t bytes_left; @@ -685,7 +685,7 @@ parse_server_interfaces(struct network_interface_info_i= octl_rsp *buf, */ case INTERNETWORK: addr4 =3D (struct sockaddr_in *)&tmp_iface.sockaddr; - p4 =3D (struct iface_info_ipv4 *)p->Buffer; + p4 =3D (struct smb_sockaddr_in *)p->Buffer; addr4->sin_family =3D AF_INET; memcpy(&addr4->sin_addr, &p4->IPv4Address, 4); =20 @@ -697,7 +697,7 @@ parse_server_interfaces(struct network_interface_info_i= octl_rsp *buf, break; case INTERNETWORKV6: addr6 =3D (struct sockaddr_in6 *)&tmp_iface.sockaddr; - p6 =3D (struct iface_info_ipv6 *)p->Buffer; + p6 =3D (struct smb_sockaddr_in6 *)p->Buffer; addr6->sin6_family =3D AF_INET6; memcpy(&addr6->sin6_addr, &p6->IPv6Address, 16); =20 diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h index c013560bcfa1..0be63c00f848 100644 --- a/fs/smb/client/smb2pdu.h +++ b/fs/smb/client/smb2pdu.h @@ -261,19 +261,6 @@ struct network_resiliency_req { } __packed; /* There is no buffer for the response ie no struct network_resiliency_rsp= */ =20 -struct iface_info_ipv4 { - __be16 Port; - __be32 IPv4Address; - __be64 Reserved; -} __packed; - -struct iface_info_ipv6 { - __be16 Port; - __be32 FlowInfo; - __u8 IPv6Address[16]; - __be32 ScopeId; -} __packed; - #define NO_FILE_ID 0xFFFFFFFFFFFFFFFFULL /* general ioctls to srv not to f= ile */ =20 struct compress_ioctl { diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h index 25e8ece283c4..b01114108d23 100644 --- a/fs/smb/common/smb2pdu.h +++ b/fs/smb/common/smb2pdu.h @@ -1428,6 +1428,21 @@ struct network_interface_info_ioctl_rsp { }; } __packed; =20 +/* See MS-SMB2 2.2.32.5.1.1 */ +struct smb_sockaddr_in { + __be16 Port; + __be32 IPv4Address; + __u8 Reserved[8]; +} __packed; + +/* See MS-SMB2 2.2.32.5.1.2 */ +struct smb_sockaddr_in6 { + __be16 Port; + __be32 FlowInfo; + __u8 IPv6Address[16]; + __be32 ScopeId; +} __packed; + /* this goes in the ioctl buffer when doing FSCTL_SET_ZERO_DATA */ struct file_zero_data_information { __le64 FileOffset; diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index 169fbec03cfd..dd6f1375a833 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -7903,7 +7903,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_= conn *conn, idev =3D __in_dev_get_rtnl(netdev); if (!idev) continue; - sockaddr_storage->addr4.IPv4address =3D + sockaddr_storage->addr4.IPv4Address =3D idev_ipv4_address(idev); nbytes +=3D sizeof(struct network_interface_info_ioctl_rsp); ipv4_set =3D true; @@ -7911,7 +7911,7 @@ static int fsctl_query_iface_info_ioctl(struct ksmbd_= conn *conn, } else { struct inet6_dev *idev6; struct inet6_ifaddr *ifa; - __u8 *ipv6_addr =3D sockaddr_storage->addr6.IPv6address; + __u8 *ipv6_addr =3D sockaddr_storage->addr6.IPv6Address; =20 sockaddr_storage->Family =3D INTERNETWORKV6; sockaddr_storage->addr6.Port =3D 0; diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h index fe92bfeb415a..5a76b706ccd9 100644 --- a/fs/smb/server/smb2pdu.h +++ b/fs/smb/server/smb2pdu.h @@ -136,19 +136,6 @@ struct create_posix_rsp { =20 #define SMB2_0_IOCTL_IS_FSCTL 0x00000001 =20 -struct smb_sockaddr_in { - __be16 Port; - __be32 IPv4address; - __u8 Reserved[8]; -} __packed; - -struct smb_sockaddr_in6 { - __be16 Port; - __be32 FlowInfo; - __u8 IPv6address[16]; - __be32 ScopeId; -} __packed; - struct sockaddr_storage_rsp { __le16 Family; union { --=20 2.43.0