| From 5476e22450b8891e3e786e67d558adaf4c963e40 Mon Sep 17 00:00:00 2001 |
| From: Wade Mealing <wmealing@redhat.com> |
| Date: Wed, 17 Jun 2020 13:49:47 +0200 |
| Subject: [PATCH] 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 <wmealing@redhat.com> |
| Cc: stable <stable@vger.kernel.org> |
| 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 <maier@linux.ibm.com> |
| Acked-by: Minchan Kim <minchan@kernel.org> |
| Link: https://lore.kernel.org/r/20200617114946.GA2131650@kroah.com |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c |
| index 1bf4a908a0bd..36d49159140f 100644 |
| --- a/drivers/block/zram/zram_drv.c |
| +++ b/drivers/block/zram/zram_drv.c |
| @@ -2023,7 +2023,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, |
| -- |
| 2.27.0 |
| |
