Commit da4759c7 authored by Guenter Roeck's avatar Guenter Roeck Committed by Greg Kroah-Hartman

sysfs: Use only return value from is_visible for the file mode

Up to now, is_visible can only be used to either remove visibility
of a file entirely or to add permissions, but not to reduce permissions.
This makes it impossible, for example, to use DEVICE_ATTR_RW to define
file attributes and reduce permissions to read-only.

This behavior is undesirable and unnecessarily complicates code which
needs to reduce permissions; instead of just returning the desired
permissions, it has to ensure that the permissions in the attribute
variable declaration only reflect the minimal permissions ever needed.

Change semantics of is_visible to only use the permissions returned
from it instead of oring the returned value with the hard-coded
Signed-off-by: default avatarGuenter Roeck <>
Signed-off-by: default avatarVivien Didelot <>
Signed-off-by: default avatarGreg Kroah-Hartman <>
parent bc465aa9
......@@ -41,7 +41,7 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj,
if (grp->attrs) {
for (i = 0, attr = grp->attrs; *attr && !error; i++, attr++) {
umode_t mode = 0;
umode_t mode = (*attr)->mode;
* In update mode, we're changing the permissions or
......@@ -56,8 +56,7 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj,
error = sysfs_add_file_mode_ns(parent, *attr, false,
(*attr)->mode | mode,
mode, NULL);
if (unlikely(error))
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment