Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()"
Subsystems (2)
PATCH 1/1 Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()"
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can write to this file.
[fixed formatting and made static - gregkh]
--- drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/zram/zram_drv.c +2 -1
@@ -2021,7 +2021,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,
Signature · 1 line
2.27.0
Quoted 4 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can write to this file.
Minor confusion on my side:
Did you mean "read from" instead of "write to"? I.e. only owner may read but not group nor others. Whereas using CLASS_ATTR_RO would resolve into 0444.
Quoted 27 lines
[fixed formatting and made static - gregkh]
Reported-by Wade Mealing <[email protected]>Cc stable <[email protected]>Fixes f40609d1591f ("zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()")Signed-off-by Greg Kroah-Hartman <[email protected]>--- drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/block/zram/zram_drv.c +2
-1@@ -2021,7 +2021,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,
Signature · 11 lines
Mit freundlichen Gruessen / Kind regards Steffen Maier Linux on IBM Z Development https://www.ibm.com/privacy/us/en/ IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Matthias Hartmann Geschaeftsfuehrung: Dirk Wittkopp Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Quoted 10 lines · Steffen Maier
Quoted 4 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can write to this file.
Minor confusion on my side:
Did you mean "read from" instead of "write to"? I.e. only owner may read but not group nor others. Whereas usingCLASS_ATTR_ROwould resolve into 0444.
Sorry, you are correct, I'll fix the changelog text and send this out again.
It's a "fun" file, reading from it causes something to happen, not the normal way things work :(
greg k-h
PATCH v2 1/1 Revert "zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()"
In reply to Greg Kroah-HartmanFrom: Wade Mealing <[email protected]>
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]
---
v2: fix read/write confusion in the changelog, thanks to Steffen for the
review.
was more specific as to the changes I made to the original patch.
drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/block/zram/zram_drv.c +2 -1
@@ -2021,7 +2021,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,
Signature · 1 line
2.27.0
Quoted 5 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can read from this file.
Quoted 7 lines
[fixed formatting, added changelog, and made attribute static - gregkh]
Reported-by Wade Mealing <[email protected]>Cc stable <[email protected]>Fixes f40609d1591f ("zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()")Signed-off-by Greg Kroah-Hartman <[email protected]>
Quoted 23 lines
---
v2: fix read/write confusion in the changelog, thanks to Steffen for the
review.
was more specific as to the changes I made to the original patch.drivers/block/zram/zram_drv.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)drivers/block/zram/zram_drv.c +2
-1@@ -2021,7 +2021,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,
Signature · 11 lines
Mit freundlichen Gruessen / Kind regards Steffen Maier Linux on IBM Z Development https://www.ibm.com/privacy/us/en/ IBM Deutschland Research & Development GmbH Vorsitzender des Aufsichtsrats: Matthias Hartmann Geschaeftsfuehrung: Dirk Wittkopp Sitz der Gesellschaft: Boeblingen Registergericht: Amtsgericht Stuttgart, HRB 243294
Quoted 5 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can read from this file.
Quoted 7 lines
[fixed formatting, added changelog, and made attribute static - gregkh]
Reported-by Wade Mealing <[email protected]>Cc stable <[email protected]>Fixes f40609d1591f ("zram: convert remaining CLASS_ATTR() to CLASS_ATTR_RO()")Signed-off-by Greg Kroah-Hartman <[email protected]>
Hi Greg,
Quoted 4 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can write to this file.
^^^^^^^^
s/write to/read from/
As Wade reported, it's sufficient to read from it to create a zram entry.
Regards,
Willy
Quoted 11 lines · Willy Tarreau
Hi Greg,
Quoted 4 lines · Greg Kroah-Hartman
From: Wade Mealing <[email protected]>
Turns out that the permissions for 0400 really are what we want here, otherwise any user can write to this file.
^^^^^^^^s/write to/read from/
As Wade reported, it's sufficient to read from it to create a zram entry.
Bah I just saw your v2 now, sorry for the noise.
Willy