sysfs: add support for binary attributes in groups
Quoted 18 lines · Greg Kroah-Hartman
groups should be able to support binary attributes, just like it supports "normal" attributes. This lets us only handle one type of structure, groups, throughout the driver core and subsystems, making binary attributes a "full fledged" part of the driver model, and not something just "tacked on".
Reported-by Oliver Schinagl <[email protected]>Signed-off-by Greg Kroah-Hartman <[email protected]>--- fs/sysfs/group.c | 18 ++++++++++++++++-- include/linux/sysfs.h | 4 ++-- 2 files changed, 18 insertions(+), 4 deletions(-)fs/sysfs/group.c +0
-0
fs/sysfs/group.c static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, · line 23
Quoted 5 lines
fs/sysfs/group.c +1
-1@@ -20,16 +20,19 @@ static void remove_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, const struct attribute_group *grp) {struct attribute *const * attr; -int i; +struct bin_attribute *const * bin_attr;
checkpatch doesn't like the above and similar declarations below.
Yes, I know, nitpick, just saying ;).
Quoted 17 lines
fs/sysfs/group.c +4
-1-for (i =0 , attr = grp->attrs; *attr; i++, attr++) +for (attr = grp->attrs; *attr; attr++)sysfs_hash_and_remove (dir_sd,NULL , (*attr)->name); +for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) +sysfs_remove_bin_file (kobj, *bin_attr); }static int create_files (struct sysfs_dirent *dir_sd,struct kobject *kobj,const struct attribute_group *grp,int update) {struct attribute *const * attr; +struct bin_attribute *const * bin_attr;int error =0 , i;for (i =0 , attr = grp->attrs; *attr && !error; i++, attr++) {
fs/sysfs/group.c static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, · line 57
Quoted 3 lines
fs/sysfs/group.c +0
-0@@ -52,6 +55,17 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, }if (error)remove_files (dir_sd, kobj, grp);
You might want to abort here if there was an error.
fs/sysfs/group.c static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, · line 59
Quoted 2 lines
fs/sysfs/group.c +2
-0+ +for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {
What happens here if grp->bin_attrs is NULL ? Doesn't that cause a NULL reference when accessing *bin_attr ?
[ The problem didn't exist before since attr was supposed to be non-NULL.
It may now be a problem if only bin_attr is provided, ie if there are only binary attribute files.
Or maybe I am just tired and there is no problem... ]
Quoted 40 lines
fs/sysfs/group.c +9
-0+if (update) +sysfs_remove_bin_file (kobj, *bin_attr); + error =sysfs_create_bin_file (kobj, *bin_attr); +if (error) +break ; + } +if (error) +remove_files (dir_sd, kobj, grp); +return error; }include/linux/sysfs.h +2
-2@@ -21,6 +21,7 @@struct kobject ;struct module ; +struct bin_attribute ;enum kobj_ns_type ;struct attribute {@@ -59,10 +60,9 @@ struct attribute_group {umode_t (*is_visible)(struct kobject *,struct attribute *,int );struct attribute **attrs; +struct bin_attribute **bin_attrs; }; - -/** * Use these macros to make defining attributes easier. See include/linux/device.h * for examples.. Signature · 1 line
1.8.3.rc0.20.gb99dd2e
Quoted 7 lines · Guenter Roeck
Review static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, · line 57
Quoted 4 lines · Greg Kroah-Hartman
(quoted diff) +0
-0@@ -52,6 +55,17 @@ static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, } if (error) remove_files(dir_sd, kobj, grp);You might want to abort here if there was an error.
Good point, I'll update it.
Quoted 10 lines
Review static int create_files(struct sysfs_dirent *dir_sd, struct kobject *kobj, · line 59
Quoted 2 lines
(quoted diff) +2
-0+ + for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {What happens here if
grp->bin_attrsis NULL ? Doesn't that cause a NULL reference when accessing*bin_attr?[ The problem didn't exist before since attr was supposed to be non-NULL.
It may now be a problem if onlybin_attris provided, ie if there are only binary attribute files.
Or maybe I am just tired and there is no problem... ]
I thought I tested this patch out, but I think you are right, let me go do a rebuild and test it again...
thanks,
greg k-h
Quoted 6 lines · Greg Kroah-Hartman
Quoted 5 lines · Guenter Roeck
Review
Quoted 1 line
(quoted diff) +1
-0+ for (bin_attr = grp->bin_attrs; *bin_attr; bin_attr++) {What happens here if
grp->bin_attrsis NULL ? Doesn't that cause a NULL reference when accessing*bin_attr?
Quoted 7 lines
Quoted 4 lines
[ The problem didn't exist before since attr was supposed to be non-NULL.
It may now be a problem if onlybin_attris provided, ie if there are only binary attribute files.
Or maybe I am just tired and there is no problem... ]I thought I tested this patch out, but I think you are right, let me go do a rebuild and test it again...
You were right, good catch, as-is, the kernel dies at boot, I've fixed this and will resend the series, thanks so much for the review.
greg k-h