From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from omta034.useast.a.cloudfilter.net (omta034.useast.a.cloudfilter.net [44.202.169.33]) (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 C02D513D88A for ; Tue, 23 Apr 2024 18:58:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=44.202.169.33 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713898733; cv=none; b=ViggubOJsb8N3cVGHvblF5tb3F3qq+sfIji8Q+JRTWnUCe17WtXet1YHiMCfDt3IVZOijTH40A9dSPPVgVhg0QQzsjodrAGAI87jB73cCb5VSfKziXUS1avD7gYFleKHhlmnXJnQetbomwnS16B9sVRU+1YE40W5KelG0aCLtd8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1713898733; c=relaxed/simple; bh=f5asz7Rg97zKGbkTzOs82/GI89e/GuehMtZHkZszavA=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=qNTNL+QTqzqSQD+EtDc+WgTGb/TeWiVTNzFLj3deVifVGxvH8rBV3bEIKp0GPuZlvHJdO7eulqwsWFmYTlyYhfnu3VfoBC6wQUenV+1kje3Lwab21VnO0JMc76ookzga3ivcHhuEIldfnUVJtmlqt9GYjQqeA0ljZUVbjaCUtLg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com; spf=pass smtp.mailfrom=embeddedor.com; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b=RhdLMYFl; arc=none smtp.client-ip=44.202.169.33 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=embeddedor.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=embeddedor.com header.i=@embeddedor.com header.b="RhdLMYFl" Received: from eig-obgw-5008a.ext.cloudfilter.net ([10.0.29.246]) by cmsmtp with ESMTPS id zIFHr1gbis4yTzLKMrfLvK; Tue, 23 Apr 2024 18:57:14 +0000 Received: from gator4166.hostgator.com ([108.167.133.22]) by cmsmtp with ESMTPS id zLKLr01GGU0uyzLKLrboBD; Tue, 23 Apr 2024 18:57:14 +0000 X-Authority-Analysis: v=2.4 cv=VYTxPkp9 c=1 sm=1 tr=0 ts=6628048a a=1YbLdUo/zbTtOZ3uB5T3HA==:117 a=Hqfmxdny5oJaKcjBIeTgUQ==:17 a=IkcTkHD0fZMA:10 a=raytVjVEu-sA:10 a=wYkD_t78qR0A:10 a=NEAV23lmAAAA:8 a=VwQbUJbxAAAA:8 a=6OTePVu0V_H-DbwPzNgA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=embeddedor.com; s=default; h=Content-Transfer-Encoding:Content-Type: In-Reply-To:From:References:Cc:To:Subject:MIME-Version:Date:Message-ID:Sender :Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=u+lfmcao/yxKYY0WXvcSy1ZZCst8lw+LlJnf7QThhkM=; b=RhdLMYFlFVs5u53Y2YlpFPBXSc AQuqdsPwazoBYr+Lcg7WIojo8PQt+Dfrdfbgx2GA0emnNvzsBGaSboZcAjvO2IcvdcxDlW1KIchUX D3Bjjw6j3AXRubsu3ScNE/GghY1fpxPI7GZoW7BRCRckEMpUhyY5jCgV1jO4Yb5b/RkXFxf5f49oK TW3nBH9ItwEiZwnGvkjVOwEnWT//3rLK36GPMMEvYFswWcpsVihL2hIxh/k0Hn1/qULgMitURpxaQ ywbLgs1yNtIRKJ7aYQ9ZWp/kjroUJolAkXFn2mfr7h3CIySqAs7btBJapePR+ECi/wSxNtyVVWNgG V0Thnn4w==; Received: from [187.217.74.226] (port=54074 helo=[10.10.24.12]) by gator4166.hostgator.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.96.2) (envelope-from ) id 1rzLKJ-000G4t-21; Tue, 23 Apr 2024 13:57:11 -0500 Message-ID: <1166494b-3e34-4919-9998-141540a948b3@embeddedor.com> Date: Wed, 24 Apr 2024 04:57:07 +1000 Precedence: bulk X-Mailing-List: linux-hardening@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH][next] smb: smb2pdu.h: Avoid -Wflex-array-member-not-at-end warnings To: "Gustavo A. R. Silva" , Steve French , Paulo Alcantara , Ronnie Sahlberg , Shyam Prasad N , Tom Talpey , Bharath SM , Namjae Jeon , Sergey Senozhatsky Cc: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org, linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org, Kees Cook References: Content-Language: en-US From: "Gustavo A. R. Silva" In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - gator4166.hostgator.com X-AntiAbuse: Original Domain - vger.kernel.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - embeddedor.com X-BWhitelist: no X-Source-IP: 187.217.74.226 X-Source-L: No X-Exim-ID: 1rzLKJ-000G4t-21 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: ([10.10.24.12]) [187.217.74.226]:54074 X-Source-Auth: gustavo@embeddedor.com X-Email-Count: 2 X-Org: HG=hgshared;ORG=hostgator; X-Source-Cap: Z3V6aWRpbmU7Z3V6aWRpbmU7Z2F0b3I0MTY2Lmhvc3RnYXRvci5jb20= X-Local-Domain: yes X-CMAE-Envelope: MS4xfEj+AtWOfrD1TmZTBUpwDaeNLn85cPI6EkKidMV6x5/ktKuUWEOye5LZDF6XLKqShYM1T4d7zsiEtxXS4a40NeQ/8JryvHwIrgRLm4svTCqLx24f3vQi H6d+fDUkLCFDXbSY1uCCrT8DjlepURSYTbjFqOcCSlWl+hh8an9RR7mFXOsFxyxEXDFhUhJky5ub+i05KIC/q7+zx75Scmbl9wVsbZ1gWP3lwnH9Br3cMw9E Hi all, Friendly ping: who can take this, please? Thanks -- Gustavo On 11/04/24 09:35, Gustavo A. R. Silva wrote: > -Wflex-array-member-not-at-end is coming in GCC-14, and we are getting > ready to enable it globally. > > So, in order to avoid ending up with a flexible-array member in the > middle of multiple other structs, we use the `__struct_group()` helper > to separate the flexible array from the rest of the members in the > flexible structure, and use the tagged `struct create_context_hdr` > instead of `struct create_context`. > > So, with these changes, fix 51 of the following warnings[1]: > > fs/smb/client/../common/smb2pdu.h:1225:31: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end] > > Link: https://gist.github.com/GustavoARSilva/772526a39be3dd4db39e71497f0a9893 [1] > Link: https://github.com/KSPP/linux/issues/202 > Signed-off-by: Gustavo A. R. Silva > --- > fs/smb/client/smb2pdu.h | 12 ++++++------ > fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++--------------- > fs/smb/server/smb2pdu.h | 18 +++++++++--------- > 3 files changed, 33 insertions(+), 30 deletions(-) > > diff --git a/fs/smb/client/smb2pdu.h b/fs/smb/client/smb2pdu.h > index c72a3b2886b7..1a02bd9e0c00 100644 > --- a/fs/smb/client/smb2pdu.h > +++ b/fs/smb/client/smb2pdu.h > @@ -145,7 +145,7 @@ struct durable_context_v2 { > } __packed; > > struct create_durable_v2 { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct durable_context_v2 dcontext; > } __packed; > @@ -167,7 +167,7 @@ struct durable_reconnect_context_v2_rsp { > } __packed; > > struct create_durable_handle_reconnect_v2 { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct durable_reconnect_context_v2 dcontext; > __u8 Pad[4]; > @@ -175,7 +175,7 @@ struct create_durable_handle_reconnect_v2 { > > /* See MS-SMB2 2.2.13.2.5 */ > struct crt_twarp_ctxt { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le64 Timestamp; > > @@ -183,12 +183,12 @@ struct crt_twarp_ctxt { > > /* See MS-SMB2 2.2.13.2.9 */ > struct crt_query_id_ctxt { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > } __packed; > > struct crt_sd_ctxt { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct smb3_sd sd; > } __packed; > @@ -415,7 +415,7 @@ struct smb2_posix_info_parsed { > }; > > struct smb2_create_ea_ctx { > - struct create_context ctx; > + struct create_context_hdr ctx; > __u8 name[8]; > struct smb2_file_full_ea_info ea; > } __packed; > diff --git a/fs/smb/common/smb2pdu.h b/fs/smb/common/smb2pdu.h > index 1b594307c9d5..eab9d49c63ba 100644 > --- a/fs/smb/common/smb2pdu.h > +++ b/fs/smb/common/smb2pdu.h > @@ -1171,12 +1171,15 @@ struct smb2_server_client_notification { > #define SMB2_CREATE_FLAG_REPARSEPOINT 0x01 > > struct create_context { > - __le32 Next; > - __le16 NameOffset; > - __le16 NameLength; > - __le16 Reserved; > - __le16 DataOffset; > - __le32 DataLength; > + /* New members must be added within the struct_group() macro below. */ > + __struct_group(create_context_hdr, hdr, __packed, > + __le32 Next; > + __le16 NameOffset; > + __le16 NameLength; > + __le16 Reserved; > + __le16 DataOffset; > + __le32 DataLength; > + ); > __u8 Buffer[]; > } __packed; > > @@ -1222,7 +1225,7 @@ struct smb2_create_rsp { > } __packed; > > struct create_posix { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[16]; > __le32 Mode; > __u32 Reserved; > @@ -1230,7 +1233,7 @@ struct create_posix { > > /* See MS-SMB2 2.2.13.2.3 and MS-SMB2 2.2.13.2.4 */ > struct create_durable { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > union { > __u8 Reserved[16]; > @@ -1243,14 +1246,14 @@ struct create_durable { > > /* See MS-SMB2 2.2.13.2.5 */ > struct create_mxac_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le64 Timestamp; > } __packed; > > /* See MS-SMB2 2.2.14.2.5 */ > struct create_mxac_rsp { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le32 QueryStatus; > __le32 MaximalAccess; > @@ -1286,13 +1289,13 @@ struct lease_context_v2 { > } __packed; > > struct create_lease { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct lease_context lcontext; > } __packed; > > struct create_lease_v2 { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct lease_context_v2 lcontext; > __u8 Pad[4]; > @@ -1300,7 +1303,7 @@ struct create_lease_v2 { > > /* See MS-SMB2 2.2.14.2.9 */ > struct create_disk_id_rsp { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le64 DiskFileId; > __le64 VolumeId; > @@ -1309,7 +1312,7 @@ struct create_disk_id_rsp { > > /* See MS-SMB2 2.2.13.2.13 */ > struct create_app_inst_id { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[16]; > __le32 StructureSize; /* Must be 20 */ > __u16 Reserved; > @@ -1318,7 +1321,7 @@ struct create_app_inst_id { > > /* See MS-SMB2 2.2.13.2.15 */ > struct create_app_inst_id_vers { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[16]; > __le32 StructureSize; /* Must be 24 */ > __u16 Reserved; > diff --git a/fs/smb/server/smb2pdu.h b/fs/smb/server/smb2pdu.h > index bd1d2a0e9203..643f5e1cfe35 100644 > --- a/fs/smb/server/smb2pdu.h > +++ b/fs/smb/server/smb2pdu.h > @@ -64,7 +64,7 @@ struct preauth_integrity_info { > #define SMB2_SESSION_TIMEOUT (10 * HZ) > > struct create_durable_req_v2 { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le32 Timeout; > __le32 Flags; > @@ -73,7 +73,7 @@ struct create_durable_req_v2 { > } __packed; > > struct create_durable_reconn_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > union { > __u8 Reserved[16]; > @@ -85,7 +85,7 @@ struct create_durable_reconn_req { > } __packed; > > struct create_durable_reconn_v2_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct { > __u64 PersistentFileId; > @@ -96,13 +96,13 @@ struct create_durable_reconn_v2_req { > } __packed; > > struct create_alloc_size_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le64 AllocationSize; > } __packed; > > struct create_durable_rsp { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > union { > __u8 Reserved[8]; > @@ -114,7 +114,7 @@ struct create_durable_rsp { > /* Flags */ > #define SMB2_DHANDLE_FLAG_PERSISTENT 0x00000002 > struct create_durable_v2_rsp { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > __le32 Timeout; > __le32 Flags; > @@ -122,7 +122,7 @@ struct create_durable_v2_rsp { > > /* equivalent of the contents of SMB3.1.1 POSIX open context response */ > struct create_posix_rsp { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[16]; > __le32 nlink; > __le32 reparse_tag; > @@ -381,13 +381,13 @@ struct smb2_ea_info { > } __packed; /* level 15 Query */ > > struct create_ea_buf_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct smb2_ea_info ea; > } __packed; > > struct create_sd_buf_req { > - struct create_context ccontext; > + struct create_context_hdr ccontext; > __u8 Name[8]; > struct smb_ntsd ntsd; > } __packed;