linux-kernel - [PATCH] io_uring: fix SQPOLL cpu check

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <5D2859FE-DB39-48F5-BBB5-6EDD3791B6C3@raithlin.com>
Date:   Tue, 11 Jun 2019 23:56:06 +0000
From:   "Stephen  Bates" <sbates@...thlin.com>
To:     "linux-block@...r.kernel.org" <linux-block@...r.kernel.org>,
        "linux-fsdevel@...r.kernel.org" <linux-fsdevel@...r.kernel.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
CC:     Jens Axboe <axboe@...nel.dk>,
        "mark.rutland@....com" <mark.rutland@....com>,
        "shhuiw@...mail.com" <shhuiw@...mail.com>,
        Logan Gunthorpe <logang@...tatee.com>,
        "viro@...iv.linux.org.uk" <viro@...iv.linux.org.uk>
Subject: [PATCH] io_uring: fix SQPOLL cpu check

The array_index_nospec() check in io_sq_offload_start() is performed
before any checks on p->sq_thread_cpu are done. This means cpu is
clamped and therefore no error occurs when out-of-range values are
passed in from userspace. This is in violation of the specification
for io_ring_setup() and causes the io_ring_setup unit test in liburing
to regress.

Add a new bounds check on sq_thread_cpu at the start of
io_sq_offload_start() so we can exit the function early when bad
values are passed in.

Fixes: 975554b03edd ("io_uring: fix SQPOLL cpu validation")
Signed-off-by: Stephen Bates <sbates@...thlin.com>
---
 fs/io_uring.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/fs/io_uring.c b/fs/io_uring.c
index 30a5687..e458470 100644
--- a/fs/io_uring.c
+++ b/fs/io_uring.c
@@ -2316,6 +2316,9 @@ static int io_sq_offload_start(struct io_ring_ctx *ctx,
 {
 	int ret;
 
+	if (p->sq_thread_cpu >= nr_cpu_ids)
+		return -EINVAL;
+
 	init_waitqueue_head(&ctx->sqo_wait);
 	mmgrab(current->mm);
 	ctx->sqo_mm = current->mm;
-- 
2.7.4