[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <7cf9389e-8290-4b53-9b5f-813061e28572@web.de>
Date: Wed, 8 Oct 2025 20:48:27 +0200
From: Markus Elfring <Markus.Elfring@....de>
To: linux-cifs@...r.kernel.org, samba-technical@...ts.samba.org,
Aurelien Aptel <aaptel@...e.com>, Bharath SM <bharathsm@...rosoft.com>,
Paulo Alcantara <pc@...guebit.org>,
Ronnie Sahlberg <ronniesahlberg@...il.com>,
Shyam Prasad N <sprasad@...rosoft.com>, Steve French <sfrench@...ba.org>,
Tom Talpey <tom@...pey.com>
Cc: LKML <linux-kernel@...r.kernel.org>, kernel-janitors@...r.kernel.org
Subject: [PATCH 2/2] smb: client: Improve memory release in
smb3_simple_fallocate_range()
From: Markus Elfring <elfring@...rs.sourceforge.net>
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.
Signed-off-by: Markus Elfring <elfring@...rs.sourceforge.net>
---
fs/smb/client/smb2ops.c | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/fs/smb/client/smb2ops.c b/fs/smb/client/smb2ops.c
index ec188dedbf97..38cef1ff3826 100644
--- a/fs/smb/client/smb2ops.c
+++ b/fs/smb/client/smb2ops.c
@@ -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;
}
--
2.51.0
Powered by blists - more mailing lists