Commit 8bb04fb2 authored Aug 20, 2024 by Thorsten Blum Committed by Steve French Sep 20, 2024

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

Replace the deprecated one-element arrays with flexible-array members
in the structs copychunk_ioctl_req and smb2_ea_info_req.

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

parent 289ebd9a

fs/smb/server/smb2pdu.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -4587,7 +4587,7 @@ static int smb2_get_ea(struct ksmbd_work work, struct ksmbd_file fp,
		path = &fp->filp->f_path;
		/* single EA entry is requested with given user.* name */
		if (req->InputBufferLength) {
		if (le32_to_cpu(req->InputBufferLength) <
		if (le32_to_cpu(req->InputBufferLength) <=
		sizeof(struct smb2_ea_info_req))
		return -EINVAL;

		@@ -8091,7 +8091,7 @@ int smb2_ioctl(struct ksmbd_work *work)
		goto out;
		}

		if (in_buf_len < sizeof(struct copychunk_ioctl_req)) {
		if (in_buf_len <= sizeof(struct copychunk_ioctl_req)) {
		ret = -EINVAL;
		goto out;
		}

fs/smb/server/smb2pdu.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -194,7 +194,7 @@ struct copychunk_ioctl_req {
		__le64 ResumeKey[3];
		__le32 ChunkCount;
		__le32 Reserved;
		__u8 Chunks[1]; /* array of srv_copychunk */
		__u8 Chunks[]; /* array of srv_copychunk */
		} __packed;

		struct srv_copychunk {
		@@ -370,7 +370,7 @@ struct smb2_file_attr_tag_info {
		struct smb2_ea_info_req {
		__le32 NextEntryOffset;
		__u8 EaNameLength;
		char name[1];
		char name[];
		} __packed; /* level 15 Query */

		struct smb2_ea_info {