Skip to content

Commit 5c7e9cc

Browse files
sergey-senozhatskytorvalds
authored andcommitted
zram: restrict add/remove attributes to root only
zram hot_add sysfs attribute is a very 'special' attribute - reading from it creates a new uninitialized zram device. This file, by a mistake, can be read by a 'normal' user at the moment, while only root must be able to create a new zram device, therefore hot_add attribute must have S_IRUSR mode, not S_IRUGO. [akpm@linux-foundation.org: s/sence/sense/, reflow comment to use 80 cols] Fixes: 6566d1a ("zram: add dynamic device add/remove functionality") Link: http://lkml.kernel.org/r/20161205155845.20129-1-sergey.senozhatsky@gmail.com Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com> Reported-by: Steven Allen <steven@stebalien.com> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Minchan Kim <minchan@kernel.org> Cc: <stable@vger.kernel.org> [4.2+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent ea5a9ef commit 5c7e9cc

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

drivers/block/zram/zram_drv.c

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1413,8 +1413,14 @@ static ssize_t hot_remove_store(struct class *class,
14131413
return ret ? ret : count;
14141414
}
14151415

1416+
/*
1417+
* NOTE: hot_add attribute is not the usual read-only sysfs attribute. In a
1418+
* sense that reading from this file does alter the state of your system -- it
1419+
* creates a new un-initialized zram device and returns back this device's
1420+
* device_id (or an error code if it fails to create a new device).
1421+
*/
14161422
static struct class_attribute zram_control_class_attrs[] = {
1417-
__ATTR_RO(hot_add),
1423+
__ATTR(hot_add, 0400, hot_add_show, NULL),
14181424
__ATTR_WO(hot_remove),
14191425
__ATTR_NULL,
14201426
};

0 commit comments

Comments
 (0)