summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>2015-03-12 09:58:27 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-25 13:27:57 +0100
commitd8bf8c92e80fed9119eb222c7e5cc88acf57c12c (patch)
tree76781b5c56d41e896e0b29cc0cd7e884ee4a22b8
parentda4759c73b0f1aac79f37bdb39ad2124439c30e7 (diff)
downloadlinux-stable-d8bf8c92e80fed9119eb222c7e5cc88acf57c12c.tar.gz
linux-stable-d8bf8c92e80fed9119eb222c7e5cc88acf57c12c.tar.bz2
linux-stable-d8bf8c92e80fed9119eb222c7e5cc88acf57c12c.zip
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.c6
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,
if (!mode)
continue;
}
+
+ WARN(mode & ~(SYSFS_PREALLOC | 0664),
+ "Attribute %s: Invalid permissions 0%o\n",
+ (*attr)->name, mode);
+
+ mode &= SYSFS_PREALLOC | 0664;
error = sysfs_add_file_mode_ns(parent, *attr, false,
mode, NULL);
if (unlikely(error))