ksmbd: Use struct_size() to improve get_file_alternate_info()

toblux · smfrench · commit 04afb0a3c30a · 2024-10-01T14:50:51.000-05:00
Use struct_size() to calculate the output buffer length.

Signed-off-by: Thorsten Blum &lt;thorsten.blum@linux.dev&gt;
Acked-by: Namjae Jeon &lt;linkinjeon@kernel.org&gt;
Signed-off-by: Steve French &lt;stfrench@microsoft.com&gt;
diff --git a/fs/smb/server/smb2pdu.c b/fs/smb/server/smb2pdu.c
@@ -4883,7 +4883,7 @@ static void get_file_alternate_info(struct ksmbd_work *work,
 	spin_unlock(&dentry->d_lock);
 	file_info->FileNameLength = cpu_to_le32(conv_len);
 	rsp->OutputBufferLength =
-		cpu_to_le32(sizeof(struct smb2_file_alt_name_info) + conv_len);
+		cpu_to_le32(struct_size(file_info, FileName, conv_len));
 }
 
 static int get_file_stream_info(struct ksmbd_work *work,

Original file line number	Diff line number	Diff line change
`@@ -4883,7 +4883,7 @@ static void get_file_alternate_info(struct ksmbd_work *work,`
`4883`	`4883`	`spin_unlock(&dentry->d_lock);`
`4884`	`4884`	`file_info->FileNameLength = cpu_to_le32(conv_len);`
`4885`	`4885`	`rsp->OutputBufferLength =`
`4886`		`- cpu_to_le32(sizeof(struct smb2_file_alt_name_info) + conv_len);`
	`4886`	`+ cpu_to_le32(struct_size(file_info, FileName, conv_len));`
`4887`	`4887`	`}`
`4888`	`4888`
`4889`	`4889`	`static int get_file_stream_info(struct ksmbd_work *work,`