2018-07-27 21:35:43

by Tyler Hicks

Subject: [PATCH net-next] 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 <[email protected]>
Reported-by: Heiner Kallweit <[email protected]>
---

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);

--
2.7.4

2018-07-28 15:48:22

by Heiner Kallweit

Subject: Re: [PATCH net-next] sysfs: Fix regression when adding a file to an existing group

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 <[email protected]>
> Reported-by: Heiner Kallweit <[email protected]>
> ---
>
> 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 <[email protected]>

2018-07-29 20:12:53

by David Miller

Subject: Re: [PATCH net-next] sysfs: Fix regression when adding a file to an existing group

From: Tyler Hicks <[email protected]>
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 <[email protected]>
> Reported-by: Heiner Kallweit <[email protected]>
> ---
>
> 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.