summaryrefslogtreecommitdiff
path: root/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch
diff options
context:
space:
mode:
Diffstat (limited to 'recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch')
-rw-r--r--recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch b/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch
new file mode 100644
index 0000000..c56c72f
--- /dev/null
+++ b/recipes-kernel/linux/linux-toradex-rt-4.9-2.3.x/revert_aio_fix_spectre_gadget_in_lookup_ioctx.patch
@@ -0,0 +1,28 @@
+commit 2f7fbc052b632c0ae2d4a2bb5d5c928bbc24ca43
+Author: Marcel Ziswiler <marcel.ziswiler@toradex.com>
+Date: Tue Apr 9 04:12:18 2019 +0200
+
+ Revert "aio: fix spectre gadget in lookup_ioctx"
+
+ This reverts commit 3a7bac902691cd92cb69f95d98dc675dea8b3228.
+
+diff --git a/fs/aio.c b/fs/aio.c
+index c3fc80294397..b1170a7affe2 100644
+--- a/fs/aio.c
++++ b/fs/aio.c
+@@ -40,7 +40,6 @@
+ #include <linux/ramfs.h>
+ #include <linux/percpu-refcount.h>
+ #include <linux/mount.h>
+-#include <linux/nospec.h>
+
+ #include <asm/kmap_types.h>
+ #include <asm/uaccess.h>
+@@ -1072,7 +1071,6 @@ 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))