From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from out-185.mta0.migadu.com (out-185.mta0.migadu.com [91.218.175.185]) (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 216D826ED5F; Sun, 2 Nov 2025 07:32:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=91.218.175.185 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762068774; cv=none; b=W5YvyI+8jujF1l0E6XQTYUuKObbyom2gHt1QsvVJS7cQmAI7gDoXnCpUYRKWm/rfBJ/Aduzwh+2MLfHLI1I30tSM7SNNVV/YexejmcUDDf3uCub4+Q+8EXKKH1Vflo7bFQbcBCPCamERjU4fHP4pJnSl72hgWVSyZi51eudCcAo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1762068774; c=relaxed/simple; bh=UeZzbSHmR4lF0G+TfiRIeniaE4nzFAnDL8k8itVVLLM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W2MNttVGqGSEombbCVN89KrhpTl5lbWD7HF7uf/tbJafAjJF9eYMrK8os/im+Q92zYY4+MLDILOSs9dSAJ4B/iMjcvbiFOvvC//k6aCfkiMAvuXAamktu4mv+7qJpAJFS9/7/64Tm1+/8p+2haXw1cX1SOcLHEHCjSBha+jz6qk= 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=o/MA7Hsk; arc=none smtp.client-ip=91.218.175.185 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="o/MA7Hsk" 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=1762068770; 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=DDMjuxf9BpHp/EzTTNG2zysOA62X4HAFIHHM5OaIv5c=; b=o/MA7Hsk24UrRuaa5SyiU52aVnm1Nk87mx3VcmXtaDPhN3+N6asMSWZOI9nSW7KsdGdqak YmY6VmViML4XjLdQEruzeFFuSzomF5EWSrc+EaCeXHy8hmud03ia/PNwbdw1bcLwe5VftD BlzP/JrRXbB6St9FGlAsGqZ+nMzOLs8= From: chenxiaosong.chenxiaosong@linux.dev To: sfrench@samba.org, smfrench@gmail.com, linkinjeon@kernel.org, linkinjeon@samba.org, christophe.jaillet@wanadoo.fr Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org, ChenXiaoSong Subject: [PATCH v5 12/14] smb: move FILE_SYSTEM_ATTRIBUTE_INFO to common/fscc.h Date: Sun, 2 Nov 2025 15:30:57 +0800 Message-ID: <20251102073059.3681026-13-chenxiaosong.chenxiaosong@linux.dev> In-Reply-To: <20251102073059.3681026-1-chenxiaosong.chenxiaosong@linux.dev> References: <20251102073059.3681026-1-chenxiaosong.chenxiaosong@linux.dev> Precedence: bulk X-Mailing-List: linux-cifs@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Migadu-Flow: FLOW_OUT From: ChenXiaoSong Rename "struct filesystem_attribute_info" to "FILE_SYSTEM_ATTRIBUTE_INFO", then move them to common header file. Calculate the minimum size of FileFsAttributeInformation using offsetof(). On the server, replace original "sizeof(struct filesystem_attribute_info)" with "MIN_FS_ATTR_INFO_SIZE". Signed-off-by: ChenXiaoSong --- fs/smb/client/cifspdu.h | 10 ---------- fs/smb/common/fscc.h | 14 ++++++++++++++ fs/smb/server/smb2pdu.c | 6 +++--- fs/smb/server/smb_common.h | 7 ------- 4 files changed, 17 insertions(+), 20 deletions(-) diff --git a/fs/smb/client/cifspdu.h b/fs/smb/client/cifspdu.h index a9a853b9011f..2c454e450dfa 100644 --- a/fs/smb/client/cifspdu.h +++ b/fs/smb/client/cifspdu.h @@ -2063,16 +2063,6 @@ typedef struct { #define FILE_PORTABLE_DEVICE 0x00004000 #define FILE_DEVICE_ALLOW_APPCONTAINER_TRAVERSAL 0x00020000 -/* minimum includes first three fields, and empty FS Name */ -#define MIN_FS_ATTR_INFO_SIZE 12 - -typedef struct { - __le32 Attributes; - __le32 MaxPathNameComponentLength; - __le32 FileSystemNameLen; - char FileSystemName[52]; /* do not have to save this - get subset? */ -} __attribute__((packed)) FILE_SYSTEM_ATTRIBUTE_INFO; - /******************************************************************************/ /* QueryFileInfo/QueryPathinfo (also for SetPath/SetFile) data buffer formats */ /******************************************************************************/ diff --git a/fs/smb/common/fscc.h b/fs/smb/common/fscc.h index a0580a772a41..9d3ac9903357 100644 --- a/fs/smb/common/fscc.h +++ b/fs/smb/common/fscc.h @@ -94,6 +94,20 @@ struct smb2_file_network_open_info { __le32 Reserved; } __packed; /* level 34 Query also similar returned in close rsp and open rsp */ +/* See FS-FSCC 2.5.1 */ +typedef struct { + __le32 Attributes; + __le32 MaxPathNameComponentLength; + __le32 FileSystemNameLen; + __le16 FileSystemName[52]; /* do not have to save this - get subset? */ +} __packed FILE_SYSTEM_ATTRIBUTE_INFO; + +/* + * minimum size of FileFsAttributeInformation + * includes first three fields, and empty FS Name + */ +#define MIN_FS_ATTR_INFO_SIZE offsetof(FILE_SYSTEM_ATTRIBUTE_INFO, FileSystemName) + /* List of FileSystemAttributes - see MS-FSCC 2.5.1 */ #define FILE_SUPPORTS_SPARSE_VDL 0x10000000 /* faster nonsparse extend */ #define FILE_SUPPORTS_BLOCK_REFCOUNTING 0x08000000 /* allow ioctl dup extents */ diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c index ae778ad99d30..221e979adcef 100644 --- a/fs/smb/server/smb2pdu.c +++ b/fs/smb/server/smb2pdu.c @@ -5492,10 +5492,10 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work, } case FS_ATTRIBUTE_INFORMATION: { - struct filesystem_attribute_info *info; + FILE_SYSTEM_ATTRIBUTE_INFO *info; size_t sz; - info = (struct filesystem_attribute_info *)rsp->Buffer; + info = (FILE_SYSTEM_ATTRIBUTE_INFO *)rsp->Buffer; info->Attributes = cpu_to_le32(FILE_SUPPORTS_OBJECT_IDS | FILE_PERSISTENT_ACLS | FILE_UNICODE_ON_DISK | @@ -5514,7 +5514,7 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work, "NTFS", PATH_MAX, conn->local_nls, 0); len = len * 2; info->FileSystemNameLen = cpu_to_le32(len); - sz = sizeof(struct filesystem_attribute_info) + len; + sz = MIN_FS_ATTR_INFO_SIZE + len; rsp->OutputBufferLength = cpu_to_le32(sz); break; } diff --git a/fs/smb/server/smb_common.h b/fs/smb/server/smb_common.h index e7298faa3c6a..afeba063cc27 100644 --- a/fs/smb/server/smb_common.h +++ b/fs/smb/server/smb_common.h @@ -97,13 +97,6 @@ struct smb_negotiate_rsp { __le16 ByteCount; } __packed; -struct filesystem_attribute_info { - __le32 Attributes; - __le32 MaxPathNameComponentLength; - __le32 FileSystemNameLen; - __le16 FileSystemName[]; /* do not have to save this - get subset? */ -} __packed; - struct filesystem_vol_info { __le64 VolumeCreationTime; __le32 SerialNumber; -- 2.43.0