torvalds/linux
torvalds/linux
2
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-09-04 20:19:47 +08:00
Code

module: sysfs: Drop member 'module_sect_attr::address'

Browse Source 
'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>
This commit is contained in:
Thomas Weißschuh 2024-12-27 14:23:21 +01:00 committed by Petr Pavlu
parent d8959b947a
commit 4b2c11e4aa
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
kernel/module/sysfs.c
View File

@ -21,7 +21,6 @@
#ifdef CONFIG_KALLSYMS #ifdef CONFIG_KALLSYMS
struct module_sect_attr { struct module_sect_attr {
struct bin_attribute battr; struct bin_attribute battr;
unsigned long address;
}; };
struct module_sect_attrs { struct module_sect_attrs {
@ -34,8 +33,6 @@ static ssize_t module_sect_read(struct file *file, struct kobject *kobj,
struct bin_attribute *battr, struct bin_attribute *battr,
char *buf, loff_t pos, size_t count) 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]; char bounce[MODULE_SECT_READ_SIZE + 1];
size_t wrote; 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", wrote = scnprintf(bounce, sizeof(bounce), "0x%px\n",
kallsyms_show_value(file->f_cred) kallsyms_show_value(file->f_cred)
? (void *)sattr->address : NULL); ? battr->private : NULL);
count = min(count, wrote); count = min(count, wrote);
memcpy(buf, bounce, count); 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)) if (sect_empty(sec))
continue; continue;
sysfs_bin_attr_init(&sattr->battr); sysfs_bin_attr_init(&sattr->battr);
sattr->address = sec->sh_addr;
sattr->battr.attr.name = sattr->battr.attr.name =
kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL); kstrdup(info->secstrings + sec->sh_name, GFP_KERNEL);
if (!sattr->battr.attr.name) { if (!sattr->battr.attr.name) {
@ -107,6 +103,7 @@ static int add_sect_attrs(struct module *mod, const struct load_info *info)
goto out; goto out;
} }
sattr->battr.read = module_sect_read; sattr->battr.read = module_sect_read;
sattr->battr.private = (void *)sec->sh_addr;
sattr->battr.size = MODULE_SECT_READ_SIZE; sattr->battr.size = MODULE_SECT_READ_SIZE;
sattr->battr.attr.mode = 0400; sattr->battr.attr.mode = 0400;
*(gattr++) = &(sattr++)->battr; *(gattr++) = &(sattr++)->battr;