diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 12:18:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-12-14 12:18:30 -0800 |
| commit | 380ef2c9ad4fdd5fdd81055857be21ae5f581877 (patch) | |
| tree | 2d0406850494e77236e8eb20feb8c8d2889316ff | |
| parent | 743e3c8f19db951ce9d20e6accb290444f4737a4 (diff) | |
| parent | 927b6b2d69b4cc900fa50d7e46d8f1fa91c91b3a (diff) | |
| download | linux-master.tar.gz | |
Pull block fixes from Jens Axboe:
"Three small fixes for this week. contains:
- spectre indexing fix for aio (Jeff)
- fix for the previous zeroing bio fix, we don't need it for user
mapped pages, and in fact it breaks some applications if we do
(Keith)
- allocation failure fix for null_blk with zoned (Shin'ichiro)"
* tag 'for-linus-20181214' of git://git.kernel.dk/linux-block:
block: Fix null_blk_zoned creation failure with small number of zones
aio: fix spectre gadget in lookup_ioctx
block/bio: Do not zero user pages
| -rw-r--r-- | block/bio.c | 3 | ||||
| -rw-r--r-- | block/blk-zoned.c | 2 | ||||
| -rw-r--r-- | fs/aio.c | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/block/bio.c b/block/bio.c index 4f4d9884443b63..4d86e90654b20f 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1261,7 +1261,8 @@ struct bio *bio_copy_user_iov(struct request_queue *q, if (ret) goto cleanup; } else { - zero_fill_bio(bio); + if (bmd->is_our_pages) + zero_fill_bio(bio); iov_iter_advance(iter, bio->bi_iter.bi_size); } diff --git a/block/blk-zoned.c b/block/blk-zoned.c index 13ba2011a306a8..a327bef076422e 100644 --- a/block/blk-zoned.c +++ b/block/blk-zoned.c @@ -378,7 +378,7 @@ static struct blk_zone *blk_alloc_zones(int node, unsigned int *nr_zones) struct page *page; int order; - for (order = get_order(size); order > 0; order--) { + for (order = get_order(size); order >= 0; order--) { page = alloc_pages_node(node, GFP_NOIO | __GFP_ZERO, order); if (page) { *nr_zones = min_t(unsigned int, *nr_zones, diff --git a/fs/aio.c b/fs/aio.c index 97f9835929256b..aac9659381d256 100644 --- a/fs/aio.c +++ b/fs/aio.c @@ -45,6 +45,7 @@ #include <asm/kmap_types.h> #include <linux/uaccess.h> +#include <linux/nospec.h> #include "internal.h" @@ -1038,6 +1039,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id) if (!table || id >= table->nr) goto out; + id = array_index_nospec(id, table->nr); ctx = rcu_dereference(table->table[id]); if (ctx && ctx->user_id == ctx_id) { if (percpu_ref_tryget_live(&ctx->users)) |