Skip to content

Commit 906c508

Browse files
t-8chgregkh
authored andcommitted
sysfs: attribute_group: allow registration of const bin_attribute
To be able to constify instances of struct bin_attribute it has to be possible to add them to string attribute_group. The current type of the bin_attrs member however is not compatible with that. Introduce a union that allows registration of both const and non-const attributes to enable a piecewise transition. As both union member types are compatible no logic needs to be adapted. Technically it is now possible register a const struct bin_attribute and receive it as mutable pointer in the callbacks. This is a soundness issue. But this same soundness issue already exists today in sysfs_create_bin_file(). Also the struct definition and callback implementation are always closely linked and are meant to be moved to const in lockstep. Signed-off-by: Thomas Weißschuh <[email protected]> Link: https://lore.kernel.org/r/20241115-b4-sysfs-const-bin_attr-group-v1-1-2c9bb12dfc48@weissschuh.net Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 369a9c0 commit 906c508

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

include/linux/sysfs.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,10 @@ struct attribute_group {
106106
const struct bin_attribute *,
107107
int);
108108
struct attribute **attrs;
109-
struct bin_attribute **bin_attrs;
109+
union {
110+
struct bin_attribute **bin_attrs;
111+
const struct bin_attribute *const *bin_attrs_new;
112+
};
110113
};
111114

112115
#define SYSFS_PREALLOC 010000

0 commit comments

Comments
 (0)