| Message ID | 20210326011117.GA46303@embeddedor (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [next] cifs: cifspdu.h: Replace one-element array with flexible-array member | expand |
On 3/26/21 10:54, Aurélien Aptel wrote: > "Gustavo A. R. Silva" <gustavoars@kernel.org> writes: >> There is a regular need in the kernel to provide a way to declare having >> a dynamically sized set of trailing elements in a structure. Kernel code >> should always use “flexible array members”[1] for these cases. The older >> style of one-element or zero-length arrays should no longer be used[2]. > > I've checked the usages of the struct, looks OK (we don't allocate it > directly, we use memory from the small/big buff pools). Awesome. :) > Reviewed-by: Aurelien Aptel <aaptel@suse.com> Thank you, Aurelien. -- Gustavo
"Gustavo A. R. Silva" <gustavoars@kernel.org> writes: > There is a regular need in the kernel to provide a way to declare having > a dynamically sized set of trailing elements in a structure. Kernel code > should always use “flexible array members”[1] for these cases. The older > style of one-element or zero-length arrays should no longer be used[2]. I've checked the usages of the struct, looks OK (we don't allocate it directly, we use memory from the small/big buff pools). Reviewed-by: Aurelien Aptel <aaptel@suse.com> Cheers,
merged into cifs-2.6.git for-next On Fri, Mar 26, 2021 at 12:02 PM Gustavo A. R. Silva <gustavo@embeddedor.com> wrote: > > > > On 3/26/21 10:54, Aurélien Aptel wrote: > > "Gustavo A. R. Silva" <gustavoars@kernel.org> writes: > >> There is a regular need in the kernel to provide a way to declare having > >> a dynamically sized set of trailing elements in a structure. Kernel code > >> should always use “flexible array members”[1] for these cases. The older > >> style of one-element or zero-length arrays should no longer be used[2]. > > > > I've checked the usages of the struct, looks OK (we don't allocate it > > directly, we use memory from the small/big buff pools). > > Awesome. :) > > > Reviewed-by: Aurelien Aptel <aaptel@suse.com> > > Thank you, Aurelien. > -- > Gustavo
On 4/8/21 23:23, Steve French wrote:
> merged into cifs-2.6.git for-next
Great. :)
Thanks, Steve.
--
Gustavo
diff --git a/fs/cifs/cifspdu.h b/fs/cifs/cifspdu.h index 64fe5a47b5e8..475a517360e5 100644 --- a/fs/cifs/cifspdu.h +++ b/fs/cifs/cifspdu.h @@ -1898,7 +1898,7 @@ typedef struct smb_com_transaction2_fnext_req { __le16 InformationLevel; __u32 ResumeKey; __le16 SearchFlags; - char ResumeFileName[1]; + char ResumeFileName[]; } __attribute__((packed)) TRANSACTION2_FNEXT_REQ; typedef struct smb_com_transaction2_fnext_rsp {
There is a regular need in the kernel to provide a way to declare having a dynamically sized set of trailing elements in a structure. Kernel code should always use “flexible array members”[1] for these cases. The older style of one-element or zero-length arrays should no longer be used[2]. Also, this helps with the ongoing efforts to enable -Warray-bounds by fixing the following warning: CC [M] fs/cifs/cifssmb.o fs/cifs/cifssmb.c: In function ‘CIFSFindNext’: fs/cifs/cifssmb.c:4636:23: warning: array subscript 1 is above array bounds of ‘char[1]’ [-Warray-bounds] 4636 | pSMB->ResumeFileName[name_len+1] = 0; | ~~~~~~~~~~~~~~~~~~~~^~~~~~~~~~~~ [1] https://en.wikipedia.org/wiki/Flexible_array_member [2] https://www.kernel.org/doc/html/v5.10/process/deprecated.html#zero-length-and-one-element-arrays Link: https://github.com/KSPP/linux/issues/79 Link: https://github.com/KSPP/linux/issues/109 Signed-off-by: Gustavo A. R. Silva <gustavoars@kernel.org> --- fs/cifs/cifspdu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)