summaryrefslogtreecommitdiffstats
path: root/fs/sysfs
diff options
context:
space:
mode:
authorTyler Hicks <tyhicks@canonical.com>2018-07-27 23:33:27 +0200
committerDavid S. Miller <davem@davemloft.net>2018-07-29 22:11:28 +0200
commitd1753390274f7760e5b593cb657ea34f0617e559 (patch)
treebf1b53ec2bd412bbee30ef32128769447b31bb86 /fs/sysfs
parentMerge tag 'mlx5e-updates-2018-07-27' of git://git.kernel.org/pub/scm/linux/ke... (diff)
downloadlinux-d1753390274f7760e5b593cb657ea34f0617e559.tar.xz
linux-d1753390274f7760e5b593cb657ea34f0617e559.zip
sysfs: Fix regression when adding a file to an existing group
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> Tested-by: Heiner Kallweit <hkallweit1@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'fs/sysfs')
-rw-r--r--fs/sysfs/file.c2
1 files changed, 1 insertions, 1 deletions
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);