From: Markus Elfring <Markus.Elfring@web.de>
To: linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
Aurelien Aptel <aaptel@suse.com>,
Bharath SM <bharathsm@microsoft.com>,
Paulo Alcantara <pc@manguebit.org>,
Ronnie Sahlberg <ronniesahlberg@gmail.com>,
Shyam Prasad N <sprasad@microsoft.com>,
Steve French <sfrench@samba.org>, Tom Talpey <tom@talpey.com>
Cc: LKML <linux-kernel@vger.kernel.org>, kernel-janitors@vger.kernel.org
Subject: [PATCH 2/2] smb: client: Improve memory release in smb3_simple_fallocate_range()
Date: Wed, 8 Oct 2025 20:48:27 +0200 [thread overview]
Message-ID: <7cf9389e-8290-4b53-9b5f-813061e28572@web.de> (raw)
In-Reply-To: <98b5e2a8-4bc4-4282-987e-01cd6fcd8f00@web.de>
From: Markus Elfring <elfring@users.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@users.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
prev parent reply other threads:[~2025-10-08 18:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-10-08 18:44 [PATCH 0/2] smb: client: Better exception handling in smb3_simple_fallocate_range() Markus Elfring
2025-10-08 18:46 ` [PATCH 1/2] smb: client: Return directly after a failed SMB2_ioctl() " Markus Elfring
2025-10-08 18:48 ` Markus Elfring [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7cf9389e-8290-4b53-9b5f-813061e28572@web.de \
--to=markus.elfring@web.de \
--cc=aaptel@suse.com \
--cc=bharathsm@microsoft.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-cifs@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=pc@manguebit.org \
--cc=ronniesahlberg@gmail.com \
--cc=samba-technical@lists.samba.org \
--cc=sfrench@samba.org \
--cc=sprasad@microsoft.com \
--cc=tom@talpey.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).