From: "Gustavo A. R. Silva" <gustavo@embeddedor.com>
To: Thorsten Blum <thorsten.blum@toblux.com>,
linkinjeon@kernel.org, sfrench@samba.org,
senozhatsky@chromium.org, tom@talpey.com
Cc: linux-cifs@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-hardening@vger.kernel.org
Subject: Re: [PATCH v2] ksmbd: Replace one-element arrays with flexible-array members
Date: Fri, 16 Aug 2024 13:20:53 -0600 [thread overview]
Message-ID: <a5663c6f-8061-4682-ab89-e4dec40ce9a3@embeddedor.com> (raw)
In-Reply-To: <20240816173338.151113-2-thorsten.blum@toblux.com>
On 16/08/24 11:33, Thorsten Blum wrote:
> Replace the deprecated one-element arrays with flexible-array members
> in the structs filesystem_attribute_info and filesystem_device_info.
>
> There are no binary differences after this conversion.
>
> Link: https://github.com/KSPP/linux/issues/79
> Signed-off-by: Thorsten Blum <thorsten.blum@toblux.com>
Looks good.
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Thanks
-Gustavo
> ---
> Changes in v2:
> - Take struct size changes into account and do not subtract 2 additional
> bytes after feedback from Gustavo A. R. Silva
> - Compare the binaries before and after the conversion and add a note
> that there are no differences
> - Link to v1: https://lore.kernel.org/linux-kernel/20240816135823.87543-1-thorsten.blum@toblux.com/
> ---
> fs/smb/server/smb2pdu.c | 4 ++--
> fs/smb/server/smb_common.h | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
> index 2df1354288e6..1ce747b4636b 100644
> --- a/fs/smb/server/smb2pdu.c
> +++ b/fs/smb/server/smb2pdu.c
> @@ -5357,7 +5357,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) - 2 + len;
> + sz = sizeof(struct filesystem_attribute_info) + len;
> rsp->OutputBufferLength = cpu_to_le32(sz);
> break;
> }
> @@ -5383,7 +5383,7 @@ static int smb2_get_info_filesystem(struct ksmbd_work *work,
> len = len * 2;
> info->VolumeLabelSize = cpu_to_le32(len);
> info->Reserved = 0;
> - sz = sizeof(struct filesystem_vol_info) - 2 + len;
> + sz = sizeof(struct filesystem_vol_info) + 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 4a3148b0167f..cc1d6dfe29d5 100644
> --- a/fs/smb/server/smb_common.h
> +++ b/fs/smb/server/smb_common.h
> @@ -213,7 +213,7 @@ struct filesystem_attribute_info {
> __le32 Attributes;
> __le32 MaxPathNameComponentLength;
> __le32 FileSystemNameLen;
> - __le16 FileSystemName[1]; /* do not have to save this - get subset? */
> + __le16 FileSystemName[]; /* do not have to save this - get subset? */
> } __packed;
>
> struct filesystem_device_info {
> @@ -226,7 +226,7 @@ struct filesystem_vol_info {
> __le32 SerialNumber;
> __le32 VolumeLabelSize;
> __le16 Reserved;
> - __le16 VolumeLabel[1];
> + __le16 VolumeLabel[];
> } __packed;
>
> struct filesystem_info {
next prev parent reply other threads:[~2024-08-16 19:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-08-16 17:33 Thorsten Blum
2024-08-16 19:20 ` Gustavo A. R. Silva [this message]
2024-08-17 0:30 ` Namjae Jeon
2024-08-20 19:15 Thorsten Blum
2024-08-22 12:01 ` Namjae Jeon
2024-09-19 9:12 ` Thorsten Blum
2024-09-19 11:42 ` Namjae Jeon
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a5663c6f-8061-4682-ab89-e4dec40ce9a3@embeddedor.com \
--to=gustavo@embeddedor.com \
--cc=linkinjeon@kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-hardening@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=senozhatsky@chromium.org \
--cc=sfrench@samba.org \
--cc=thorsten.blum@toblux.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®