github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

regmap: debugfs: Use __free(kfree) for regmap_reg_ranges_read_file

Browse Source 
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>
Link: https://patch.msgid.link/20261008-regmap-debugfs-fix-v1-1-3df2f25c01b6@nxp.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Peng Fan 2026-10-08 08:49:45 +08:00 committed by Mark Brown
parent 5ff1a5ca9f
commit f52260f49b
1 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/base/regmap/regmap-debugfs.c
View File

@ -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;
}