diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-03-12 09:58:27 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-03-25 08:27:57 -0400 |
commit | d8bf8c92e80fed9119eb222c7e5cc88acf57c12c (patch) | |
tree | 76781b5c56d41e896e0b29cc0cd7e884ee4a22b8 | |
parent | da4759c73b0f1aac79f37bdb39ad2124439c30e7 (diff) |
sysfs: Only accept read/write permissions for file attributes
For sysfs file attributes, only read and write permissions make sense.
Mask provided attribute permissions accordingly and send a warning
to the console if invalid permission bits are set.
This patch is originally from Guenter [1] and includes the fixup
explained in the thread, that is printing permissions in octal format
and limiting the scope of attributes to SYSFS_PREALLOC | 0664.
[1] https://lkml.org/lkml/2015/1/19/599
Signed-off-by: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | fs/sysfs/group.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/fs/sysfs/group.c b/fs/sysfs/group.c index 3fdccd99a9d9..b400c04371f0 100644 --- a/fs/sysfs/group.c +++ b/fs/sysfs/group.c | |||
@@ -55,6 +55,12 @@ static int create_files(struct kernfs_node *parent, struct kobject *kobj, | |||
55 | if (!mode) | 55 | if (!mode) |
56 | continue; | 56 | continue; |
57 | } | 57 | } |
58 | |||
59 | WARN(mode & ~(SYSFS_PREALLOC | 0664), | ||
60 | "Attribute %s: Invalid permissions 0%o\n", | ||
61 | (*attr)->name, mode); | ||
62 | |||
63 | mode &= SYSFS_PREALLOC | 0664; | ||
58 | error = sysfs_add_file_mode_ns(parent, *attr, false, | 64 | error = sysfs_add_file_mode_ns(parent, *attr, false, |
59 | mode, NULL); | 65 | mode, NULL); |
60 | if (unlikely(error)) | 66 | if (unlikely(error)) |