summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Weißschuh <linux@weissschuh.net>2024-12-27 14:23:21 +0100
committerPetr Pavlu <petr.pavlu@suse.com>2025-01-26 13:05:24 +0100
commit4b2c11e4aaf7e3d7fd9ce8e5995a32ff5e27d74f (patch)
tree3127d74a560fa37548343ec87dd760912cfead0e
parentd8959b947a8dfab1047c6fd5e982808f65717bfe (diff)
module: sysfs: Drop member 'module_sect_attr::address'
'struct bin_attribute' already contains the member 'private' to pass custom data to the attribute handlers. Use that instead of the custom 'address' member. Signed-off-by: Thomas Weißschuh <linux@weissschuh.net> Reviewed-by: Petr Pavlu <petr.pavlu@suse.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Link: https://lore.kernel.org/r/20241227-sysfs-const-bin_attr-module-v2-2-e267275f0f37@weissschuh.net Signed-off-by: Petr Pavlu <petr.pavlu@suse.com>
-rw-r--r--kernel/module/sysfs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/kernel/module/sysfs.c b/kernel/module/sysfs.c
index 31351591e8e0..6941ecc941d7 100644
--- a/kernel/module/sysfs.c
+++ b/kernel/module/sysfs.c
@@ -21,7 +21,6 @@
#ifdef CONFIG_KALLSYMS
struct module_sect_attr {
struct bin_attribute battr;
- unsigned long address;
};
struct module_sect_attrs {
@@ -34,8 +33,6 @@ static ssize_t module_sect_read(struct file *file, struct kobject *kobj,
struct bin_attribute *battr,
char *buf, loff_t pos, size_t count)
{
- struct module_sect_attr *sattr =
- container_of(battr, struct module_sect_attr, battr);
char bounce[MODULE_SECT_READ_SIZE + 1];
size_t wrote;
@@ -52,7 +49,7 @@ static ssize_t module_sect_read(struct file *file, struct kobject *kobj,
*/
wrote = scnprintf(bounce, sizeof(bounce), "0x%px\n",
kallsyms_show_value(file->f_cred)
- ? (void *)sattr->address : NULL);
+ ? battr->private : NULL);
count = min(count, wrote);
memcpy(buf, bounce, count);
@@ -99,7 +96,6 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
if (sect_empty(sec))
continue;
sysfs_bin_attr_init(&sattr->battr);
- sattr->address = sec->sh_addr;
sattr->battr.attr.name =
kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL);
if (!sattr->battr.attr.name) {
@@ -107,6 +103,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
goto out;
}
sattr->battr.read = module_sect_read;
+ sattr->battr.private = (void *)sec->sh_addr;
sattr->battr.size = MODULE_SECT_READ_SIZE;
sattr->battr.attr.mode = 0400;
*(gattr++) = &(sattr++)->battr;