瀏覽代碼

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>
Jeff Moyer 6 年之前
父節點
當前提交
a538e3ff9d
共有 1 個文件被更改,包括 2 次插入0 次删除
  1. 2 0
      fs/aio.c

+ 2 - 0
fs/aio.c

@@ -45,6 +45,7 @@
 
 
 #include <asm/kmap_types.h>
 #include <asm/kmap_types.h>
 #include <linux/uaccess.h>
 #include <linux/uaccess.h>
+#include <linux/nospec.h>
 
 
 #include "internal.h"
 #include "internal.h"
 
 
@@ -1038,6 +1039,7 @@ static struct kioctx *lookup_ioctx(unsigned long ctx_id)
 	if (!table || id >= table->nr)
 	if (!table || id >= table->nr)
 		goto out;
 		goto out;
 
 
+	id = array_index_nospec(id, table->nr);
 	ctx = rcu_dereference(table->table[id]);
 	ctx = rcu_dereference(table->table[id]);
 	if (ctx && ctx->user_id == ctx_id) {
 	if (ctx && ctx->user_id == ctx_id) {
 		if (percpu_ref_tryget_live(&ctx->users))
 		if (percpu_ref_tryget_live(&ctx->users))