From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.1 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,NICE_REPLY_A, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BCC60C388F9 for ; Sat, 7 Nov 2020 22:52:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6884720885 for ; Sat, 7 Nov 2020 22:52:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="sBr8WE3F" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726021AbgKGWwl (ORCPT ); Sat, 7 Nov 2020 17:52:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34708 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725838AbgKGWwk (ORCPT ); Sat, 7 Nov 2020 17:52:40 -0500 Received: from mail-wr1-x442.google.com (mail-wr1-x442.google.com [IPv6:2a00:1450:4864:20::442]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 50D3CC0613CF for ; Sat, 7 Nov 2020 14:52:40 -0800 (PST) Received: by mail-wr1-x442.google.com with SMTP id 23so4958396wrc.8 for ; Sat, 07 Nov 2020 14:52:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=+Bt6UgaRsmWE6y81RrcgqxuAQ+M1s5VFlpsIX2l4o4w=; b=sBr8WE3FOtpsjnwKn9kqjk15cftNGb8zvfaqmNJJ94EuOTPyUKLlq/H+HRw8nIqnPy IwoRjxKTq1iIQrTjHOriGNrnShSFHiU/fRPt0DL3xC/BWtOgJ3mxfS8WmCHb0ersTrwl YaFm1QGcmobCN9k8mKnKWEufH079soQspJ+nRR/fd5w8eSeVaaEJkOq1hms90MfXnfQB k5TO4aexSZYtNVMN6gI4oWEdkLW24+0iqrDgqwHKckwsGGow3w9p1vaoCi6a6m1/YpNK JyNXKlcVmhG+bVrMlbmFEBLVX/6uWy5cjsGqundwUJeJHVYAL43ac3MZEGybruQLnCNg WNdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:autocrypt :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=+Bt6UgaRsmWE6y81RrcgqxuAQ+M1s5VFlpsIX2l4o4w=; b=bjJC5pbuCRcBIJe4M/WJRcrW1TvQaqyK78xdQAd4JLsre9ijgV8b5z+dvJenq++Cu9 9YTSBlt8io8yoCqNjLUaqEWXVsMwzMlYnXMd+0o4kYiZj49L12Zf89MsRFzcMS+o14oy GeXgzlxWQrp//AgI+5nLqNQFkDVQOnhhr8yhwAJJoY4lFtpLfGuRA7bcP2+g16rHBuV6 nke1jrnILMoa3/x1DHmMajtWXICatD8XmdskOmenqWyZlkFUWg3977gNF/6nZcaBegeP 9UuFX/Zz+vfAJr/LHl6gLgJQmZ11h9KC9A+ocrmZG3PnD5SYBTdcVYAWNG1l/2OyKWf6 7nhg== X-Gm-Message-State: AOAM530tcX+qbKiv1u6Euu/PJO/dxlf+kqL4dnm0GAYJBs1WAds02id6 ewF8e/RmjguQA/WaQ91f5gs= X-Google-Smtp-Source: ABdhPJwImUrpdtOIjcivFwlNbD9agAx2vSWXxlUlLcafdrGtizpm4Rg/uIX29XMnLRyWOqnI7xRbxw== X-Received: by 2002:adf:cc91:: with SMTP id p17mr9838046wrj.368.1604789558986; Sat, 07 Nov 2020 14:52:38 -0800 (PST) Received: from [192.168.1.96] (host109-152-100-228.range109-152.btcentralplus.com. [109.152.100.228]) by smtp.gmail.com with ESMTPSA id u8sm164160wmg.6.2020.11.07.14.52.38 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sat, 07 Nov 2020 14:52:38 -0800 (PST) Subject: Re: [PATCH 5.11] io_uring: NULL files dereference by SQPOLL To: Jens Axboe , io-uring@vger.kernel.org Cc: Josef Grieb References: <24446f4e23e80803d3ab1a4d27a6d1a605e37b32.1604783766.git.asml.silence@gmail.com> From: Pavel Begunkov Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Message-ID: <2b72aee7-afc5-0458-c189-df873b0914ed@gmail.com> Date: Sat, 7 Nov 2020 22:49:36 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.3.0 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 07/11/2020 22:30, Jens Axboe wrote: > On 11/7/20 2:16 PM, Pavel Begunkov wrote: >> SQPOLL task may find sqo_task->files == NULL, so >> __io_sq_thread_acquire_files() would left it unset and so all the >> following fails, e.g. attempts to submit. Fail if sqo_task doesn't have >> files. >> >> [ 118.962785] BUG: kernel NULL pointer dereference, address: >> 0000000000000020 >> [ 118.963812] #PF: supervisor read access in kernel mode >> [ 118.964534] #PF: error_code(0x0000) - not-present page >> [ 118.969029] RIP: 0010:__fget_files+0xb/0x80 >> [ 119.005409] Call Trace: >> [ 119.005651] fget_many+0x2b/0x30 >> [ 119.005964] io_file_get+0xcf/0x180 >> [ 119.006315] io_submit_sqes+0x3a4/0x950 >> [ 119.006678] ? io_double_put_req+0x43/0x70 >> [ 119.007054] ? io_async_task_func+0xc2/0x180 >> [ 119.007481] io_sq_thread+0x1de/0x6a0 >> [ 119.007828] kthread+0x114/0x150 >> [ 119.008135] ? __ia32_sys_io_uring_enter+0x3c0/0x3c0 >> [ 119.008623] ? kthread_park+0x90/0x90 >> [ 119.008963] ret_from_fork+0x22/0x30 >> >> Reported-by: Josef Grieb >> Signed-off-by: Pavel Begunkov >> --- >> fs/io_uring.c | 19 ++++++++++++------- >> 1 file changed, 12 insertions(+), 7 deletions(-) >> >> diff --git a/fs/io_uring.c b/fs/io_uring.c >> index 8d721a652d61..9c035c5c4080 100644 >> --- a/fs/io_uring.c >> +++ b/fs/io_uring.c >> @@ -1080,7 +1080,7 @@ static void io_sq_thread_drop_mm_files(void) >> } >> } >> >> -static void __io_sq_thread_acquire_files(struct io_ring_ctx *ctx) >> +static int __io_sq_thread_acquire_files(struct io_ring_ctx *ctx) >> { >> if (!current->files) { >> struct files_struct *files; >> @@ -1091,7 +1091,7 @@ static void __io_sq_thread_acquire_files(struct io_ring_ctx *ctx) >> files = ctx->sqo_task->files; >> if (!files) { >> task_unlock(ctx->sqo_task); >> - return; >> + return -EFAULT; > > I don't think we should use -EFAULT here, it's generally used for trying > to copy in/out of invalid regions. Probably -ECANCELED is better here, Noted, I'll resend after Josef tests this. > in lieu of something super appropriate. Maybe -EBADF would be fine too. Yeah, something along OWNER_TASK_DEAD would make more sense. -- Pavel Begunkov