| Message ID | 20200725120039.91071-9-colyli@suse.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | bcache patches for Linux v5.9 | expand |
Hi
[This is an automated email]
This commit has been processed because it contains a -stable tag.
The stable tag indicates that it's relevant for the following trees: all
The bot has tested the following trees: v5.7.10, v5.4.53, v4.19.134, v4.14.189, v4.9.231, v4.4.231.
v5.7.10: Build OK!
v5.4.53: Build OK!
v4.19.134: Build OK!
v4.14.189: Failed to apply! Possible dependencies:
1d316e658374 ("bcache: implement PI controller for writeback rate")
25d8be77e192 ("block: move bio_alloc_pages() to bcache")
27a40ab9269e ("bcache: add backing_request_endio() for bi_end_io")
3b304d24a718 ("bcache: convert cached_dev.count from atomic_t to refcount_t")
3fd47bfe55b0 ("bcache: stop dc->writeback_rate_update properly")
5138ac6748e3 ("bcache: fix misleading error message in bch_count_io_errors()")
539d39eb2708 ("bcache: fix wrong return value in bch_debug_init()")
6f10f7d1b02b ("bcache: style fix to replace 'unsigned' by 'unsigned int'")
771f393e8ffc ("bcache: add CACHE_SET_IO_DISABLE to struct cache_set flags")
804f3c6981f5 ("bcache: fix cached_dev->count usage for bch_cache_set_error()")
b1092c9af9ed ("bcache: allow quick writeback when backing idle")
d19936a26658 ("bcache: convert to bioset_init()/mempool_init()")
d44c2f9e7cc0 ("bcache: update bucket_in_use in real time")
v4.9.231: Failed to apply! Possible dependencies:
1d316e658374 ("bcache: implement PI controller for writeback rate")
3a83f4677539 ("block: bio: pass bvec table to bio_init()")
3b304d24a718 ("bcache: convert cached_dev.count from atomic_t to refcount_t")
3fd47bfe55b0 ("bcache: stop dc->writeback_rate_update properly")
6f10f7d1b02b ("bcache: style fix to replace 'unsigned' by 'unsigned int'")
70fd76140a6c ("block,fs: use REQ_* flags directly")
804f3c6981f5 ("bcache: fix cached_dev->count usage for bch_cache_set_error()")
d19936a26658 ("bcache: convert to bioset_init()/mempool_init()")
e806402130c9 ("block: split out request-only flags into a new namespace")
ef295ecf090d ("block: better op and flags encoding")
v4.4.231: Failed to apply! Possible dependencies:
1d316e658374 ("bcache: implement PI controller for writeback rate")
3a83f4677539 ("block: bio: pass bvec table to bio_init()")
3b304d24a718 ("bcache: convert cached_dev.count from atomic_t to refcount_t")
3fd47bfe55b0 ("bcache: stop dc->writeback_rate_update properly")
4e49ea4a3d27 ("block/fs/drivers: remove rw argument from submit_bio")
6f10f7d1b02b ("bcache: style fix to replace 'unsigned' by 'unsigned int'")
804f3c6981f5 ("bcache: fix cached_dev->count usage for bch_cache_set_error()")
9082e87bfbf8 ("block: remove struct bio_batch")
ad0d9e76a412 ("bcache: use bio op accessors")
d19936a26658 ("bcache: convert to bioset_init()/mempool_init()")
d57d611505d9 ("kernel/fs: fix I/O wait not accounted for RW O_DSYNC")
ed996a52c868 ("block: simplify and cleanup bvec pool handling")
NOTE: The patch will not be queued to stable trees until it is upstream.
How should we proceed with this patch?
diff --git a/drivers/md/bcache/bcache.h b/drivers/md/bcache/bcache.h index 221e0191b687..80e3c4813fb0 100644 --- a/drivers/md/bcache/bcache.h +++ b/drivers/md/bcache/bcache.h @@ -264,7 +264,7 @@ struct bcache_device { #define BCACHE_DEV_UNLINK_DONE 2 #define BCACHE_DEV_WB_RUNNING 3 #define BCACHE_DEV_RATE_DW_RUNNING 4 - unsigned int nr_stripes; + int nr_stripes; unsigned int stripe_size; atomic_t *stripe_sectors_dirty; unsigned long *full_dirty_stripes; diff --git a/drivers/md/bcache/writeback.c b/drivers/md/bcache/writeback.c index 5397a2c5d6cc..4f4ad6b3d43a 100644 --- a/drivers/md/bcache/writeback.c +++ b/drivers/md/bcache/writeback.c @@ -521,15 +521,19 @@ void bcache_dev_sectors_dirty_add(struct cache_set *c, unsigned int inode, uint64_t offset, int nr_sectors) { struct bcache_device *d = c->devices[inode]; - unsigned int stripe_offset, stripe, sectors_dirty; + unsigned int stripe_offset, sectors_dirty; + int stripe; if (!d) return; + stripe = offset_to_stripe(d, offset); + if (stripe < 0) + return; + if (UUID_FLASH_ONLY(&c->uuids[inode])) atomic_long_add(nr_sectors, &c->flash_dev_dirty_sectors); - stripe = offset_to_stripe(d, offset); stripe_offset = offset & (d->stripe_size - 1); while (nr_sectors) { @@ -569,12 +573,12 @@ static bool dirty_pred(struct keybuf *buf, struct bkey *k) static void refill_full_stripes(struct cached_dev *dc) { struct keybuf *buf = &dc->writeback_keys; - unsigned int start_stripe, stripe, next_stripe; + unsigned int start_stripe, next_stripe; + int stripe; bool wrapped = false; stripe = offset_to_stripe(&dc->disk, KEY_OFFSET(&buf->last_scanned)); - - if (stripe >= dc->disk.nr_stripes) + if (stripe < 0) stripe = 0; start_stripe = stripe; diff --git a/drivers/md/bcache/writeback.h b/drivers/md/bcache/writeback.h index b029843ce5b6..3f1230e22de0 100644 --- a/drivers/md/bcache/writeback.h +++ b/drivers/md/bcache/writeback.h @@ -52,10 +52,22 @@ static inline uint64_t bcache_dev_sectors_dirty(struct bcache_device *d) return ret; } -static inline unsigned int offset_to_stripe(struct bcache_device *d, +static inline int offset_to_stripe(struct bcache_device *d, uint64_t offset) { do_div(offset, d->stripe_size); + + /* d->nr_stripes is in range [1, INT_MAX] */ + if (unlikely(offset >= d->nr_stripes)) { + pr_err("Invalid stripe %llu (>= nr_stripes %d).\n", + offset, d->nr_stripes); + return -EINVAL; + } + + /* + * Here offset is definitly smaller than INT_MAX, + * return it as int will never overflow. + */ return offset; } @@ -63,7 +75,10 @@ static inline bool bcache_dev_stripe_dirty(struct cached_dev *dc, uint64_t offset, unsigned int nr_sectors) { - unsigned int stripe = offset_to_stripe(&dc->disk, offset); + int stripe = offset_to_stripe(&dc->disk, offset); + + if (stripe < 0) + return false; while (1) { if (atomic_read(dc->disk.stripe_sectors_dirty + stripe))
offset_to_stripe() returns the stripe number (in type unsigned int) from an offset (in type uint64_t) by the following calculation, do_div(offset, d->stripe_size); For large capacity backing device (e.g. 18TB) with small stripe size (e.g. 4KB), the result is 4831838208 and exceeds UINT_MAX. The actual returned value which caller receives is 536870912, due to the overflow. Indeed in bcache_device_init(), bcache_device->nr_stripes is limited in range [1, INT_MAX]. Therefore all valid stripe numbers in bcache are in range [0, bcache_dev->nr_stripes - 1]. This patch adds a upper limition check in offset_to_stripe(): the max valid stripe number should be less than bcache_device->nr_stripes. If the calculated stripe number from do_div() is equal to or larger than bcache_device->nr_stripe, -EINVAL will be returned. (Normally nr_stripes is less than INT_MAX, exceeding upper limitation doesn't mean overflow, therefore -EOVERFLOW is not used as error code.) This patch also changes nr_stripes' type of struct bcache_device from 'unsigned int' to 'int', and return value type of offset_to_stripe() from 'unsigned int' to 'int', to match their exact data ranges. All locations where bcache_device->nr_stripes and offset_to_stripe() are referenced also get updated for the above type change. Reported-and-tested-by: Ken Raeburn <raeburn@redhat.com> Signed-off-by: Coly Li <colyli@suse.de> Link: https://bugzilla.redhat.com/show_bug.cgi?id=1783075 Cc: stable@vger.kernel.org --- drivers/md/bcache/bcache.h | 2 +- drivers/md/bcache/writeback.c | 14 +++++++++----- drivers/md/bcache/writeback.h | 19 +++++++++++++++++-- 3 files changed, 27 insertions(+), 8 deletions(-)