From: Wade Mealing Date: Wed, 17 Jun 2020 11:49:47 +0000 (+0200) Subject: Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()" X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5cd9ec70b9f6431fc3e60075c01bc00f08c5606b;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()" commit 853eab68afc80f59f36bbdeb715e5c88c501e680 upstream. Turns out that the permissions for 0400 really are what we want here, otherwise any user can read from this file. [fixed formatting, added changelog, and made attribute static - gregkh] Reported-by: Wade Mealing Cc: stable Fixes: f40609d1591f ("zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()") Link: https://bugzilla.redhat.com/show_bug.cgi?id=1847832 Reviewed-by: Steffen Maier Acked-by: Minchan Kim Link: https://lore.kernel.org/r/20200617114946.GA2131650@kroah.com Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c index 1b4e195c0d3c..0d906ca8d4f5 100644 --- a/drivers/block/zram/zram_drv.c +++ b/drivers/block/zram/zram_drv.c @@ -1648,7 +1648,8 @@ static ssize_t hot_add_show(struct class *class, return ret; return scnprintf(buf, PAGE_SIZE, "%d\n", ret); } -static CLASS_ATTR_RO(hot_add); +static struct class_attribute class_attr_hot_add = + __ATTR(hot_add, 0400, hot_add_show, NULL); static ssize_t hot_remove_store(struct class *class, struct class_attribute *attr,