aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2018-12-11 12:37:49 -0500
committerJens Axboe <axboe@kernel.dk>2018-12-11 13:45:50 -0500
commita538e3ff9dabcdf6c3f477a373c629213d1c3066 (patch)
tree8f94a879f2bd8b990032bead3a410b1bf000558b
parentf55adad601c6a97c8c9628195453e0fb23b4a0ae (diff)
aio: fix spectre gadget in lookup_ioctx
Matthew pointed out that the ioctx_table is susceptible to spectre v1, because the index can be controlled by an attacker. The below patch should mitigate the attack for all of the aio system calls. Cc: stable@vger.kernel.org Reported-by: Matthew Wilcox <willy@infradead.org> Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
-rw-r--r--fs/aio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 301e6314183b..20c07664314a 100644
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -45,6 +45,7 @@
45 45
46#include <asm/kmap_types.h> 46#include <asm/kmap_types.h>
47#include <linux/uaccess.h> 47#include <linux/uaccess.h>
48#include <linux/nospec.h>
48 49
49#include "internal.h" 50#include "internal.h"
50 51
@@ -1038,6 +1039,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
1038 if (!table || id >= table->nr) 1039 if (!table || id >= table->nr)
1039 goto out; 1040 goto out;
1040 1041
1042 id = array_index_nospec(id, table->nr);
1041 ctx = rcu_dereference(table->table[id]); 1043 ctx = rcu_dereference(table->table[id]);
1042 if (ctx && ctx->user_id == ctx_id) { 1044 if (ctx && ctx->user_id == ctx_id) {
1043 if (percpu_ref_tryget_live(&ctx->users)) 1045 if (percpu_ref_tryget_live(&ctx->users))