don't allow enabling a write back cache on devices that don't support it
Hi Jens,
this series fixes a case where a user could enable a write back cache on a device (driver) that doesn't support it all, potentially leading to flush requests being sent to a driver that doesn't know whast to do with them.
diffstat:
block/blk-settings.c | 7 +++++-- block/blk-sysfs.c | 21 ++++++++------------- include/linux/blkdev.h | 1 + 3 files changed, 14 insertions(+), 15 deletions(-)
PATCH 1/2 block: cleanup queue_wc_store
Get rid of the local queue_wc_store variable and handling setting and clearing the QUEUE_FLAG_WC flag diretly instead the if / else if.
--- block/blk-sysfs.c | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-)
block/blk-sysfs.c +3 -11
@@ -449,21 +449,13 @@ static ssize_t queue_wc_show(struct request_queue *q, char *page)static ssize_t queue_wc_store (struct request_queue *q,const char *page,size_t count) { -int set =-1 ; -if (!strncmp (page,"write back" ,10 )) - set =1 ; +blk_queue_flag_set (QUEUE_FLAG_WC , q);else if (!strncmp (page,"write through" ,13 ) || !strncmp (page,"none" ,4 )) - set =0 ; - -if (set ==-1 ) -return -EINVAL ; - -if (set) -blk_queue_flag_set (QUEUE_FLAG_WC , q); -else blk_queue_flag_clear (QUEUE_FLAG_WC , q); +else +return -EINVAL ;return count; }
Signature · 1 line
2.39.2
PATCH 2/2 block: don't allow enabling a cache on devices that don't support it
In reply to Christoph HellwigCurrently the write_cache attribute allows enabling the QUEUE_FLAG_WC flag on devices that never claimed the capability.
Fix that by adding a QUEUE_FLAG_HW_WC flag that is set by blk_queue_write_cache and guards re-enabling the cache through sysfs.
Note that any rescan that calls blk_queue_write_cache will still re-enable the write cache as in the current code.
--- block/blk-settings.c | 7 +++++-- block/blk-sysfs.c | 11 +++++++---- include/linux/blkdev.h | 1 + 3 files changed, 13 insertions(+), 6 deletions(-)
block/blk-settings.c +5 -2
@@ -830,10 +830,13 @@ EXPORT_SYMBOL(blk_set_queue_depth);*/ void blk_queue_write_cache (struct request_queue *q,bool wc,bool fua) { -if (wc) +if (wc) { +blk_queue_flag_set (QUEUE_FLAG_HW_WC , q);blk_queue_flag_set (QUEUE_FLAG_WC , q); -else + }else { +blk_queue_flag_clear (QUEUE_FLAG_HW_WC , q);blk_queue_flag_clear (QUEUE_FLAG_WC , q); + }if (fua)blk_queue_flag_set (QUEUE_FLAG_FUA , q);else
block/blk-sysfs.c +7 -4
@@ -449,13 +449,16 @@ static ssize_t queue_wc_show(struct request_queue *q, char *page)static ssize_t queue_wc_store (struct request_queue *q,const char *page,size_t count) { -if (!strncmp (page,"write back" ,10 )) +if (!strncmp (page,"write back" ,10 )) { +if (!test_bit (QUEUE_FLAG_HW_WC , &q->queue_flags)) +return -EINVAL ;blk_queue_flag_set (QUEUE_FLAG_WC , q); -else if (!strncmp (page,"write through" ,13 ) || - !strncmp (page,"none" ,4 )) + }else if (!strncmp (page,"write through" ,13 ) || + !strncmp (page,"none" ,4 )) {blk_queue_flag_clear (QUEUE_FLAG_WC , q); -else + }else {return -EINVAL ; + }return count; }
include/linux/blkdev.h +1 -0
@@ -538,6 +538,7 @@ struct request_queue {#define QUEUE_FLAG_ADD_RANDOM 10/* Contributes to random pool */ #define QUEUE_FLAG_SYNCHRONOUS 11/* always completes in submit context */ #define QUEUE_FLAG_SAME_FORCE 12/* force complete on same CPU */ +#define QUEUE_FLAG_HW_WC 18/* Write back caching supported */ #define QUEUE_FLAG_INIT_DONE 14/* queue is initialized */ #define QUEUE_FLAG_STABLE_WRITES 15/* don't modify blks until WB is done */ #define QUEUE_FLAG_POLL 16/* IO polling enabled if set */
Signature · 1 line
2.39.2
Jens, does this make sense to you? Without this we can deliver flush requests to drivers not supporting them, which is a bit nasty even if it's not exploitable without root-equivalent access.
Jens Axboe
maintainerQuoted 3 lines · Christoph Hellwig
Jens, does this make sense to you? Without this we can deliver flush requests to drivers not supporting them, which is a bit nasty even if it's not exploitable without root-equivalent access.
Yeah I think so, I'll queue it up for 6.6.
Signature · 1 line
Jens Axboe
Quoted 5 lines · Christoph Hellwig
this series fixes a case where a user could enable a write back cache on a device (driver) that doesn't support it all, potentially leading to flush requests being sent to a driver that doesn't know whast to do with them.
Quoted 7 lines
diffstat:
block/blk-settings.c | 7 +++++-- block/blk-sysfs.c | 21 ++++++++------------- include/linux/blkdev.h | 1 + 3 files changed, 14 insertions(+), 15 deletions(-)[...]
Applied, thanks!
[1/2] block: cleanup queue_wc_store
commit: ba2b2594c0e15a40b7f42dd8aca1867c57c13145
[2/2] block: don't allow enabling a cache on devices that don't support it
commit: 3e8f23e19c95fb4757f8c77f1473578d2154d7c2Best regards,
Signature · 1 line
Jens Axboe