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=-8.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,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 5C0F8C3A5A9 for ; Mon, 4 May 2020 20:15:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 22CFA20705 for ; Mon, 4 May 2020 20:15:32 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Ge7/ZzHd" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726756AbgEDUPc (ORCPT ); Mon, 4 May 2020 16:15:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49984 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726111AbgEDUPc (ORCPT ); Mon, 4 May 2020 16:15:32 -0400 Received: from mail-wr1-x444.google.com (mail-wr1-x444.google.com [IPv6:2a00:1450:4864:20::444]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A5F57C061A0E; Mon, 4 May 2020 13:15:31 -0700 (PDT) Received: by mail-wr1-x444.google.com with SMTP id s8so10309wrt.9; Mon, 04 May 2020 13:15:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:references:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=i+RbthjxFM69yETzo2H0vFLgAF3qI0S5kE5s/KINk2o=; b=Ge7/ZzHdrTSgcP4mmTUGts8VnUNeciffJcfbr2qYA7+Y5UVx3UYdVHl2kQ3KRTB6K7 l13PvwD/ng/zkLnMUFScRkKE378fQnVthUL9rT2VGWAKbB2tcJe+3/Ieu2E98IldiGJU g5wVII4Fc5TZYWE7EQUoPBqhU8cvLsOLSr2Qc1+Lm1eQdpk1NqdMtkfYSLUU8zolMX34 oy1XsjBg+oR+z5zu12zWlooVEBvR3erDTGA0yVq4jIfdOnLsHzG+YMoe4PxXc46pf2FF lFKZElW7brRPj8froiPqiyScsbKAS5fMqmjuJIExdsoUh5OZKedVYCxWlUCS4O/Y8dNo eeLQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:references:autocrypt:subject:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=i+RbthjxFM69yETzo2H0vFLgAF3qI0S5kE5s/KINk2o=; b=Rqi8AxrOBFFH1JhRNxuHeaR0m3G7Sf+H7FnGPS6yDb6yO9PjqqZ2O5uGFfOrF12CJz kobMKEhyuGAECXAnFI7uKpf1VV0wIalXSmPEb0DEdcMhScrkhDPHZVltGjSt57G61yBY YxzYFd5Fij8XWbYvwc5poxaXybm1PZG4jJ2QmbUhtexaBPY9Z79PwK6MYb/jLQl3qKqu AbN9wKcHcVvtTUekalvLkutDTxTHok48p2bNwTMgeCCaiiSBpEcjzTfBGTPsOuWkPvbU Y2/cGc3X7eWWK80HsoM6SDmTSTpFfZflmul52J/jTLQltatiRWoNNn8kCkRfHmjwTZzt UTJg== X-Gm-Message-State: AGi0PuZ7ZTB/NKtHRQEy/Ec1lHVBmghjH8T42K5hYXKpbcE9WCyKnv/z KBqmOkRPClXQAkhnPe+POnxvWm70 X-Google-Smtp-Source: APiQypLz8vk8hJf0nq3F12fm++iFM2tz6T6ZZ3EjufS3kTZgXajO6JWKOFcQ2i6oxb2zsZVzBPocUA== X-Received: by 2002:adf:dc81:: with SMTP id r1mr1246575wrj.0.1588623330087; Mon, 04 May 2020 13:15:30 -0700 (PDT) Received: from [192.168.43.168] ([109.126.133.135]) by smtp.gmail.com with ESMTPSA id e21sm21847971wrc.1.2020.05.04.13.15.28 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 04 May 2020 13:15:29 -0700 (PDT) From: Pavel Begunkov To: Jens Axboe , Jann Horn , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Alexander Viro , linux-fsdevel References: Autocrypt: addr=asml.silence@gmail.com; prefer-encrypt=mutual; keydata= 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 bA== Subject: Re: [PATCH for-5.7] io_uring: fix zero len do_splice() Message-ID: <136e55c8-b28f-a987-d1c7-8e888cc1439a@gmail.com> Date: Mon, 4 May 2020 23:14:24 +0300 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: 8bit Sender: io-uring-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 04/05/2020 23:00, Pavel Begunkov wrote: > do_splice() doesn't expect len to be 0. Just always return 0 in this > case as splice(2) do. There is a thing, splice/tee will always return success on len=0 even with invalid fds. Fast return for len=0, should really has been done after basic validation, but I don't want to break userspace. Any ideas? > > Fixes: 7d67af2c0134 ("io_uring: add splice(2) support") > Reported-by: Jann Horn > Signed-off-by: Pavel Begunkov > --- > fs/io_uring.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/fs/io_uring.c b/fs/io_uring.c > index 65458eda2127..d53a1ef2a205 100644 > --- a/fs/io_uring.c > +++ b/fs/io_uring.c > @@ -2772,16 +2772,19 @@ static int io_splice(struct io_kiocb *req, bool force_nonblock) > struct file *out = sp->file_out; > unsigned int flags = sp->flags & ~SPLICE_F_FD_IN_FIXED; > loff_t *poff_in, *poff_out; > - long ret; > + long ret = 0; > > if (force_nonblock) > return -EAGAIN; > > poff_in = (sp->off_in == -1) ? NULL : &sp->off_in; > poff_out = (sp->off_out == -1) ? NULL : &sp->off_out; > - ret = do_splice(in, poff_in, out, poff_out, sp->len, flags); > - if (force_nonblock && ret == -EAGAIN) > - return -EAGAIN; > + > + if (sp->len) { > + ret = do_splice(in, poff_in, out, poff_out, sp->len, flags); > + if (force_nonblock && ret == -EAGAIN) > + return -EAGAIN; > + } > > io_put_file(req, in, (sp->flags & SPLICE_F_FD_IN_FIXED)); > req->flags &= ~REQ_F_NEED_CLEANUP; > -- Pavel Begunkov