summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeff Moyer <jmoyer@redhat.com>2018-12-11 12:37:49 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2018-12-11 14:32:14 -0500
commit0afa99648350dbd6d08ee3efd2376db240a6c458 (patch)
tree0700011140ed21d2636f3ee0e665d0529e88befb
parent73116df7bb90435ccb2817f44113295240d15034 (diff)
downloadlinux-stable-0afa99648350dbd6d08ee3efd2376db240a6c458.tar.gz
linux-stable-0afa99648350dbd6d08ee3efd2376db240a6c458.tar.bz2
linux-stable-0afa99648350dbd6d08ee3efd2376db240a6c458.zip
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. Reported-by: Matthew Wilcox <willy@infradead.org> Signed-off-by: Jeff Moyer <jmoyer@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/aio.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/fs/aio.c b/fs/aio.c
index 97f983592925..aac9659381d2 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))