smb: client: Better exception handling in smb3_simple_fallocate_range()
Subsystems (3)
cover smb: client: Better exception handling in smb3_simple_fallocate_range()
From: Markus Elfring <[email protected]>
Date: Wed, 8 Oct 2025 20:36:40 +0200
Refine a few implementation details for further development considerations.
Markus Elfring (2):
Return directly after a failed SMB2_ioctl()
Improve memory release
fs/smb/client/smb2ops.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
Signature · 1 line
2.51.0
PATCH 1/2 smb: client: Return directly after a failed SMB2_ioctl() in smb3_simple_fallocate_range()
From: Markus Elfring <[email protected]>
Date: Wed, 8 Oct 2025 20:02:00 +0200
* Return directly after a call of the function “SMB2_ioctl” failed at the beginning.
* Delete an initialisation for the local variable “out_data” which became unnecessary with this refactoring.
--- fs/smb/client/smb2ops.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
fs/smb/client/smb2ops.c +2 -2
@@ -3537,7 +3537,7 @@ static int smb3_simple_fallocate_range(unsigned int xid,struct cifsFileInfo *cfile, loff_t off, loff_t len) { - struct file_allocated_range_buffer in_data, *out_data = NULL, *tmp_data; + struct file_allocated_range_buffer in_data, *out_data, *tmp_data;u32 out_data_len;char *buf =NULL ;loff_t l;
@@ -3552,7 +3552,7 @@ static int smb3_simple_fallocate_range(unsigned int xid,1024 *sizeof (struct file_allocated_range_buffer ), (char **)&out_data, &out_data_len);if (rc) - goto out; +return rc; buf =kzalloc (1024 *1024 ,GFP_KERNEL );if (buf ==NULL ) {
Signature · 1 line
2.51.0
PATCH 2/2 smb: client: Improve memory release in smb3_simple_fallocate_range()
In reply to Markus ElfringFrom: Markus Elfring <[email protected]>
Date: Wed, 8 Oct 2025 20:21:38 +0200
* Adjust jump targets so that kfree() functions will be called in a recommended order at the end of this function implementation.
* Delete an initialisation for the local variable “buf” which became unnecessary with this refactoring.
--- fs/smb/client/smb2ops.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-)
fs/smb/client/smb2ops.c +9 -8
@@ -3557,7 +3557,7 @@ static int smb3_simple_fallocate_range(unsigned int xid, buf =kzalloc (1024 *1024 ,GFP_KERNEL );if (buf ==NULL ) { rc = -ENOMEM ; - goto out; + goto free_data; } tmp_data = out_data;
@@ -3568,12 +3568,12 @@ static int smb3_simple_fallocate_range(unsigned int xid,if (out_data_len ==0 ) { rc =smb3_simple_fallocate_write_range (xid, tcon, cfile, off, len, buf); - goto out; + goto free_buf; }if (out_data_len <sizeof (struct file_allocated_range_buffer )) { rc = -EINVAL ; - goto out; + goto free_buf; }if (off <le64_to_cpu (tmp_data->file_offset)) {
@@ -3588,11 +3588,12 @@ static int smb3_simple_fallocate_range(unsigned int xid, rc =smb3_simple_fallocate_write_range (xid, tcon, cfile, off, l, buf);if (rc) - goto out; + goto free_buf; + off = off + l; len = len - l;if (len ==0 ) - goto out; + goto free_buf; }/* * We are at a section of allocated data, just skip forward
@@ -3608,10 +3609,10 @@ static int smb3_simple_fallocate_range(unsigned int xid, tmp_data = &tmp_data[1 ]; out_data_len -=sizeof (struct file_allocated_range_buffer ); } - - out: -kfree (out_data); +free_buf:kfree (buf); +free_data: +kfree (out_data);return rc; }
Signature · 1 line
2.51.0