From: "Peng Fan (OSS)" <peng.fan@oss.nxp.com>
To: Mark Brown <broonie@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
"Rafael J. Wysocki" <rafael@kernel.org>,
Danilo Krummrich <dakr@kernel.org>
Cc: linux-kernel@vger.kernel.org, driver-core@lists.linux.dev,
Peng Fan <peng.fan@nxp.com>
Subject: [PATCH] regmap: debugfs: Use __free(kfree) for regmap_reg_ranges_read_file
Date: Thu, 08 Oct 2026 08:49:45 +0800 [thread overview]
Message-ID: <20261008-regmap-debugfs-fix-v1-1-3df2f25c01b6@nxp.com> (raw)
From: Peng Fan <peng.fan@nxp.com>
Convert buf and entry in regmap_reg_ranges_read_file() from manual
kfree() to __free(kfree) scope-based cleanup. This eliminates the
goto error path and the manual kfree(buf) on entry allocation failure,
simplifying the function to use straight-line returns.
Signed-off-by: Peng Fan <peng.fan@nxp.com>
---
drivers/base/regmap/regmap-debugfs.c | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
diff --git a/drivers/base/regmap/regmap-debugfs.c b/drivers/base/regmap/regmap-debugfs.c
index b2ae52a21331..b62a5dce027b 100644
--- a/drivers/base/regmap/regmap-debugfs.c
+++ b/drivers/base/regmap/regmap-debugfs.c
@@ -358,8 +358,6 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
struct regmap_debugfs_off_cache *c;
loff_t p = 0;
size_t buf_pos = 0;
- char *buf;
- char *entry;
int ret;
unsigned int entry_len;
@@ -369,15 +367,13 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
if (count > (PAGE_SIZE << MAX_PAGE_ORDER))
count = PAGE_SIZE << MAX_PAGE_ORDER;
- buf = kmalloc(count, GFP_KERNEL);
+ char *buf __free(kfree) = kmalloc(count, GFP_KERNEL);
if (!buf)
return -ENOMEM;
- entry = kmalloc(PAGE_SIZE, GFP_KERNEL);
- if (!entry) {
- kfree(buf);
+ char *entry __free(kfree) = kmalloc(PAGE_SIZE, GFP_KERNEL);
+ if (!entry)
return -ENOMEM;
- }
/* While we are at it, build the register dump cache
* now so the read() operation on the `registers' file
@@ -404,17 +400,13 @@ static ssize_t regmap_reg_ranges_read_file(struct file *file,
}
}
- kfree(entry);
ret = buf_pos;
- if (copy_to_user(user_buf, buf, buf_pos)) {
- ret = -EFAULT;
- goto out_buf;
- }
+ if (copy_to_user(user_buf, buf, buf_pos))
+ return -EFAULT;
*ppos += buf_pos;
-out_buf:
- kfree(buf);
+
return ret;
}
---
base-commit: 5ff1a5ca9f58681f870501ac58c4293306fdce0e
change-id: 20261008-regmap-debugfs-fix-26aaa0027aa1
Best regards,
--
Peng Fan <peng.fan@nxp.com>
next reply other threads:[~2026-10-08 0:52 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-08 0:49 Peng Fan (OSS) [this message]
2026-10-08 7:46 ` [PATCH] regmap: debugfs: Use __free(kfree) for regmap_reg_ranges_read_file Mark Brown
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=20261008-regmap-debugfs-fix-v1-1-3df2f25c01b6@nxp.com \
--to=peng.fan@oss.nxp.com \
--cc=broonie@kernel.org \
--cc=dakr@kernel.org \
--cc=driver-core@lists.linux.dev \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=peng.fan@nxp.com \
--cc=rafael@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.