Received: by 2002:a05:6a10:206:0:0:0:0 with SMTP id 6csp5366601pxj; Wed, 26 May 2021 08:56:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxr5TKQNJrH/wXMPCBtcZBNVB536t/vsLCqOExYTnQA7558Rrj2n1H1fTW0D6jrh6y7Sxah X-Received: by 2002:a17:906:2844:: with SMTP id s4mr3462786ejc.263.1622044590553; Wed, 26 May 2021 08:56:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1622044590; cv=none; d=google.com; s=arc-20160816; b=nZHJprDhm6wLDNlw5Oc8o9INLqOYP+RtYYv91/zRZ3EMLiFF0Mi6ooMHPHpKCV7K6U aPHknwsstok0qG9NwzC7kG/i0IR+ftOEFmyxj63Myszal5719YDurjyVkKpS6Jndr893 yyBZzgMeU/N71GKjuJzcEf327FALH8Z9Gr6MewqW/15X2+Yyw4HGR/0L68gNm2ViAsrG TUJntSh8v8RBPDzlGKSDrX+CZPhpqFXyFkbgRYiBeh2/nFny1smhiN4iKkIY4Cg2ZC+4 GLydWa0J3fAJvhDE16l/RTLw/OIwFhnkB54ptojW5xESuxlzRfkSLxuZk86OgHe8JEiu pJ1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:user-agent:in-reply-to:content-disposition :mime-version:references:message-id:subject:cc:to:from:date :dkim-signature; bh=vR7zO7ONAkB1ZzssZ7IpH6ITBFI+V1mbfLUUoRoWsaI=; b=GiKqqvNNip/EyRBAcF3AlFQ2T/ne4ZGZBNRhxo/nRjSPJH3gHcvxUET7tYpMP5TuwU 5ndGd68gcc91RzZ38pxBScgrRKpGZIb4FW35j9R1ZFvMT6gnGjcCovzjaSFlPvvWRUID cLA2P8UG/dkMDsEXZoxic2UScToHZLcuL+kLzlig9A73ADSdLDs4swFv+GtGiALLTn8y ek9hpJB1+YdzirZ8IVpbv+00vK3syaPseqRc5wt78AiucsFemj4WArc5AGWqDESSo7AX raHH35lCHuZngWEU/DJZvVf9ayJRovoov83jrHTgC1SRaddIv8O+jYKnhf+55qWZuYJ/ t9Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=WEbhhdt1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id zm10si753855ejb.739.2021.05.26.08.56.05; Wed, 26 May 2021 08:56:30 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=WEbhhdt1; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232537AbhEZPyX (ORCPT + 99 others); Wed, 26 May 2021 11:54:23 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52688 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232769AbhEZPyW (ORCPT ); Wed, 26 May 2021 11:54:22 -0400 Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B9685C061574 for ; Wed, 26 May 2021 08:52:50 -0700 (PDT) Received: by mail-wm1-x329.google.com with SMTP id h3so1010286wmq.3 for ; Wed, 26 May 2021 08:52:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=vR7zO7ONAkB1ZzssZ7IpH6ITBFI+V1mbfLUUoRoWsaI=; b=WEbhhdt1n16tMQKT5cvaOB+bIygR+ue6CrEjJ1xZdltjv9WfAHuoqfMFxn+RS06Ucb UGFvL9VaUqdtNXvCZOOfELeryPpGq5dNMMlpBsS+k3UIhm/AHqKutI+4/WKn66emgDEC eusdlHzVckAQTO5b7g0B/eS1CjY9pEb1vBhLtLxdcOzCbcBSdXLd1nGy1lNW2PpxnZV9 1wo83nFcdkZoC9X39QWic0kmKT4+dIxhfCh0I3SP7Yfb2pRxLPl8mFZXZdI6TaFukdYT Pq++S69eYsUfbY85gnK+Khk6BCWYMlKNQDg7wme7jmZJRKK66s+4Tk8uBwI5Mg7+a8XL bi2A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=vR7zO7ONAkB1ZzssZ7IpH6ITBFI+V1mbfLUUoRoWsaI=; b=ZLve/OzDHRIJ5OUqNCEMKKkv8EpKUjsqdjvbbpN6B+ko6uXidgtbHXOlESnxTCXQ3L IH9aIhD0WfRV8gTOmXfICjICDb50GTqxPGMOvgU6RX92yuU3IVIGZwTGAWf5OMff7rBm d8oPtJy2ZDbEDy3XF+PLiwcj3GbnPAcQ3bmKBxfnwoUog8sh/yiK+NioYkzhVlC8cPHg B+8bSxOvLxSKyCBOJBMy0wMkKNMD9BMEJzfqoQEQL+CLiVHGYe8enmu78m7IUhmqGMDd 6Own7noTRkiV25/amuyxUFptmnVus7a8JSMmv+00eM+LPsiOR5wkjphW0ALUNI6Y2DmC OGAw== X-Gm-Message-State: AOAM5318O1s+DTZtZWLlZKQh3qqySLLGYtnZxIpoEu497odNTYJbmc1N GfRq/OsrixKKilQ0p3GR6L1N/g== X-Received: by 2002:a05:600c:2144:: with SMTP id v4mr16047859wml.40.1622044369142; Wed, 26 May 2021 08:52:49 -0700 (PDT) Received: from elver.google.com ([2a00:79e0:15:13:74ba:ff42:8494:7f35]) by smtp.gmail.com with ESMTPSA id r17sm7412145wmh.25.2021.05.26.08.52.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 26 May 2021 08:52:48 -0700 (PDT) Date: Wed, 26 May 2021 17:52:42 +0200 From: Marco Elver To: asml.silence@gmail.com, axboe@kernel.dk Cc: syzbot , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, syzkaller-bugs@googlegroups.com, dvyukov@google.com Subject: Re: [syzbot] KCSAN: data-race in __io_uring_cancel / io_uring_try_cancel_requests Message-ID: References: <000000000000fa9f7005c33d83b9@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/2.0.5 (2021-01-21) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, May 26, 2021 at 05:48PM +0200, Marco Elver wrote: > On Wed, May 26, 2021 at 08:44AM -0700, syzbot wrote: > > Hello, > > > > syzbot found the following issue on: > > > > HEAD commit: a050a6d2 Merge tag 'perf-tools-fixes-for-v5.13-2021-05-24'.. > > git tree: upstream > > console output: https://syzkaller.appspot.com/x/log.txt?x=13205087d00000 > > kernel config: https://syzkaller.appspot.com/x/.config?x=3bcc8a6b51ef8094 > > dashboard link: https://syzkaller.appspot.com/bug?extid=73554e2258b7b8bf0bbf > > compiler: Debian clang version 11.0.1-2 > [...] > > write to 0xffff88811d8df330 of 8 bytes by task 3709 on cpu 1: > > io_uring_clean_tctx fs/io_uring.c:9042 [inline] > > __io_uring_cancel+0x261/0x3b0 fs/io_uring.c:9136 > > io_uring_files_cancel include/linux/io_uring.h:16 [inline] > > do_exit+0x185/0x1560 kernel/exit.c:781 > > do_group_exit+0xce/0x1a0 kernel/exit.c:923 > > get_signal+0xfc3/0x1610 kernel/signal.c:2835 > > arch_do_signal_or_restart+0x2a/0x220 arch/x86/kernel/signal.c:789 > > handle_signal_work kernel/entry/common.c:147 [inline] > > exit_to_user_mode_loop kernel/entry/common.c:171 [inline] > > exit_to_user_mode_prepare+0x109/0x190 kernel/entry/common.c:208 > > __syscall_exit_to_user_mode_work kernel/entry/common.c:290 [inline] > > syscall_exit_to_user_mode+0x20/0x40 kernel/entry/common.c:301 > > do_syscall_64+0x56/0x90 arch/x86/entry/common.c:57 > > entry_SYSCALL_64_after_hwframe+0x44/0xae > > > > read to 0xffff88811d8df330 of 8 bytes by task 6412 on cpu 0: > > io_uring_try_cancel_iowq fs/io_uring.c:8911 [inline] > > io_uring_try_cancel_requests+0x1ce/0x8e0 fs/io_uring.c:8933 > > io_ring_exit_work+0x7c/0x1110 fs/io_uring.c:8736 > > process_one_work+0x3e9/0x8f0 kernel/workqueue.c:2276 > > worker_thread+0x636/0xae0 kernel/workqueue.c:2422 > > kthread+0x1d0/0x1f0 kernel/kthread.c:313 > > ret_from_fork+0x1f/0x30 arch/x86/entry/entry_64.S:294 > > I wasn't entirely sure if io_wq is guaranteed to remain live in this > case in io_uring_try_cancel_iowq(), but the comment there suggests it > does. In that case, I think the below patch would explain the situation > better and also propose a fix. > > Thoughts? Due to some moving around of code, the patch lost the actual fix (using atomically read io_wq) -- so here it is again ... hopefully as intended. :-) Thanks, -- Marco From: Marco Elver Date: Wed, 26 May 2021 16:56:37 +0200 Subject: [PATCH] io_uring: fix data race to avoid potential NULL-deref Commit ba5ef6dc8a82 ("io_uring: fortify tctx/io_wq cleanup") introduced setting tctx->io_wq to NULL a bit earlier. This has caused KCSAN to detect a data race between between accesses to tctx->io_wq: write to 0xffff88811d8df330 of 8 bytes by task 3709 on cpu 1: io_uring_clean_tctx fs/io_uring.c:9042 [inline] __io_uring_cancel fs/io_uring.c:9136 io_uring_files_cancel include/linux/io_uring.h:16 [inline] do_exit kernel/exit.c:781 do_group_exit kernel/exit.c:923 get_signal kernel/signal.c:2835 arch_do_signal_or_restart arch/x86/kernel/signal.c:789 handle_signal_work kernel/entry/common.c:147 [inline] exit_to_user_mode_loop kernel/entry/common.c:171 [inline] ... read to 0xffff88811d8df330 of 8 bytes by task 6412 on cpu 0: io_uring_try_cancel_iowq fs/io_uring.c:8911 [inline] io_uring_try_cancel_requests fs/io_uring.c:8933 io_ring_exit_work fs/io_uring.c:8736 process_one_work kernel/workqueue.c:2276 ... With the config used, KCSAN only reports data races with value changes: this implies that in the case here we also know that tctx->io_wq was non-NULL. Therefore, depending on interleaving, we may end up with: [CPU 0] | [CPU 1] io_uring_try_cancel_iowq() | io_uring_clean_tctx() if (!tctx->io_wq) // false | ... ... | tctx->io_wq = NULL io_wq_cancel_cb(tctx->io_wq, ...) | ... -> NULL-deref | Note: It is likely that thus far we've gotten lucky and the compiler optimizes the double-read into a single read into a register -- but this is never guaranteed, and can easily change with a different config! Fix the data race by atomically accessing tctx->io_wq. Of course, this assumes that a valid io_wq remains alive for the duration of io_uring_try_cancel_iowq(), which should be the case per comment there. Reported-by: syzbot+bf2b3d0435b9b728946c@syzkaller.appspotmail.com Signed-off-by: Marco Elver Cc: Jens Axboe Cc: Pavel Begunkov --- fs/io_uring.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 5f82954004f6..e681ece1bbca 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -8903,14 +8903,18 @@ static bool io_uring_try_cancel_iowq(struct io_ring_ctx *ctx) mutex_lock(&ctx->uring_lock); list_for_each_entry(node, &ctx->tctx_list, ctx_node) { struct io_uring_task *tctx = node->task->io_uring; + struct io_wq *io_wq; + if (!tctx) + continue; /* * io_wq will stay alive while we hold uring_lock, because it's * killed after ctx nodes, which requires to take the lock. */ - if (!tctx || !tctx->io_wq) + io_wq = READ_ONCE(tctx->io_wq); + if (!io_wq) continue; - cret = io_wq_cancel_cb(tctx->io_wq, io_cancel_ctx_cb, ctx, true); + cret = io_wq_cancel_cb(io_wq, io_cancel_ctx_cb, ctx, true); ret |= (cret != IO_WQ_CANCEL_NOTFOUND); } mutex_unlock(&ctx->uring_lock); @@ -9039,7 +9043,7 @@ static void io_uring_clean_tctx(struct io_uring_task *tctx) struct io_tctx_node *node; unsigned long index; - tctx->io_wq = NULL; + WRITE_ONCE(tctx->io_wq, NULL); xa_for_each(&tctx->xa, index, node) io_uring_del_task_file(index); if (wq) -- 2.31.1.818.g46aad6cb9e-goog