ksmbd: Replace one-element arrays with flexible-array members

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>
Reviewed-by: Gustavo A. R. Silva <gustavoars@kernel.org>
Acked-by: Namjae Jeon <linkinjeon@kernel.org>
Signed-off-by: Steve French <stfrench@microsoft.com>

diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
index cb7f487c96af80147352344bf527a1505f5928ee..0bc9edf22ba4076b731e67d411173b2670687170 100644 (file)
--- a/fs/smb/server/smb2pdu.c
+++ b/fs/smb/server/smb2pdu.c
@@ -5360,7 +5360,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;
        }
@@ -5386,7 +5386,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 4a3148b0167f5446c98fcc99028b14cada97b1a0..cc1d6dfe29d56534e86ae24128dcc2464506e6e1 100644 (file)
--- 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 {