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 /fs | |
parent | 743e3c8f19db951ce9d20e6accb290444f4737a4 (diff) | |
parent | 927b6b2d69b4cc900fa50d7e46d8f1fa91c91b3a (diff) | |
download | linux-380ef2c9ad4fdd5fdd81055857be21ae5f581877.tar.bz2 |
Merge tag 'for-linus-20181214' of git://git.kernel.dk/linux-block
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
Diffstat (limited to 'fs')
-rw-r--r-- | fs/aio.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -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)) |