Message ID | 1532727207-10912-1-git-send-email-tyhicks@canonical.com |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
Series | [net-next] sysfs: Fix regression when adding a file to an existing group | expand |
On 27.07.2018 23:33, Tyler Hicks wrote: > Commit 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging > to arbitrary users") incorrectly changed the argument passed as the > parent parameter when calling sysfs_add_file_mode_ns(). This caused some > sysfs attribute files to not be added correctly to certain groups. > > Fixes: 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging to arbitrary users") > Signed-off-by: Tyler Hicks <tyhicks@canonical.com> > Reported-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > > Note, this was a regression exclusively in linux-next and never made it to > Linus' tree. There's no need to queue it up for linux-stable. > > fs/sysfs/file.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c > index fa46216523cf..052e5ad9a4d2 100644 > --- a/fs/sysfs/file.c > +++ b/fs/sysfs/file.c > @@ -373,7 +373,7 @@ int sysfs_add_file_to_group(struct kobject *kobj, > return -ENOENT; > > kobject_get_ownership(kobj, &uid, &gid); > - error = sysfs_add_file_mode_ns(kobj->sd, attr, false, > + error = sysfs_add_file_mode_ns(parent, attr, false, > attr->mode, uid, gid, NULL); > kernfs_put(parent); > > Tested-by: Heiner Kallweit <hkallweit1@gmail.com>
From: Tyler Hicks <tyhicks@canonical.com> Date: Fri, 27 Jul 2018 21:33:27 +0000 > Commit 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging > to arbitrary users") incorrectly changed the argument passed as the > parent parameter when calling sysfs_add_file_mode_ns(). This caused some > sysfs attribute files to not be added correctly to certain groups. > > Fixes: 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging to arbitrary users") > Signed-off-by: Tyler Hicks <tyhicks@canonical.com> > Reported-by: Heiner Kallweit <hkallweit1@gmail.com> > --- > > Note, this was a regression exclusively in linux-next and never made it to > Linus' tree. There's no need to queue it up for linux-stable. Applied, thank you.
diff --git a/fs/sysfs/file.c b/fs/sysfs/file.c index fa46216523cf..052e5ad9a4d2 100644 --- a/fs/sysfs/file.c +++ b/fs/sysfs/file.c @@ -373,7 +373,7 @@ int sysfs_add_file_to_group(struct kobject *kobj, return -ENOENT; kobject_get_ownership(kobj, &uid, &gid); - error = sysfs_add_file_mode_ns(kobj->sd, attr, false, + error = sysfs_add_file_mode_ns(parent, attr, false, attr->mode, uid, gid, NULL); kernfs_put(parent);
Commit 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging to arbitrary users") incorrectly changed the argument passed as the parent parameter when calling sysfs_add_file_mode_ns(). This caused some sysfs attribute files to not be added correctly to certain groups. Fixes: 5f81880d5204 ("sysfs, kobject: allow creating kobject belonging to arbitrary users") Signed-off-by: Tyler Hicks <tyhicks@canonical.com> Reported-by: Heiner Kallweit <hkallweit1@gmail.com> --- Note, this was a regression exclusively in linux-next and never made it to Linus' tree. There's no need to queue it up for linux-stable. fs/sysfs/file.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)