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=-14.3 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,NICE_REPLY_A,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 2D584C433E0 for ; Fri, 19 Mar 2021 10:39:13 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DAD1664DF4 for ; Fri, 19 Mar 2021 10:39:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229687AbhCSKik (ORCPT ); Fri, 19 Mar 2021 06:38:40 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229821AbhCSKii (ORCPT ); Fri, 19 Mar 2021 06:38:38 -0400 Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 62BF4C06174A for ; Fri, 19 Mar 2021 03:38:38 -0700 (PDT) Received: by mail-wm1-x336.google.com with SMTP id g20so5188470wmk.3 for ; Fri, 19 Mar 2021 03:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:references:from:autocrypt:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=YLpxeBJVv0fC9+IibkfHka1OysUZJgD9UQ/z44zZrC8=; b=ZbuBGwUF3CERFPU1TIMeQcyuFmeMIRCHETERgMlVRGVOTRhtIgV05WBJMnlNwTqTJ7 AFfeUaAmlG2OycHHgLVnlzkotoGFnLbwsmxtAgbDwgEFigUFz3c08E40/Zu5Hi2hsnh/ dd1YXQgiO4QQbYfUgTxj4N9zdR6H5T/BGj+85NS3VMlSRiaycj2b/20c30aQEWtMTDwK wBOtBYmvFSgyF2l/WKkIFSR1Nra6cVqwOKpXqqnfRbYPzFok/JBJGBsTBQTGNXDTd1JW vktAySJPul395TzsZ1SP4qFiokHFTwsVVrbGh3xd0hA4Tm+gDDUotZf9nlQgaKnqRTpj TcaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:references:from:autocrypt:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=YLpxeBJVv0fC9+IibkfHka1OysUZJgD9UQ/z44zZrC8=; b=UcpfGKfH2exNsJKI98lThi5/c1jdUZLH6TYhtxAA7M5sE22BGYl7c8vUdnWogBR4/m 5x4XG8VPuFna2izdSp5Fug0s7/4mX7jV2OTttp5rrKbc95EeSLh493Cv1bdv8sZEEJCz Y/GjwNEPgibed8KIsdzzdLXoc4aFHCy0xLDpcP+lsET59GPct30kC08U6MmRAOgvkxA8 dkdrlwym2uocJVQpO9aJQZIBVRUQEzcjXeI8B2zDxWzacTC0AGz5GWIUET+U343sXaii PbNm/T54iVCGdU/2cqd8mETGH2HUg3lq91yh7aqneKrKZ13ag+m/yRXDD4aG5r/l4zhh nygA== X-Gm-Message-State: AOAM531CBamvOFZu7gJlQzzoFLuyPVuWbS0XE1bjQ3LiR79tWEXbiL7F gK3k2EIvHUAwnUiSi4y3zyJDNT1HfKk= X-Google-Smtp-Source: ABdhPJyLlHQoNkmmvSLU62gwKlBdiNarg5A5a8NKGtOVvhqIbXPBWJ9JptHW7aQhY6WMU5jPdlBUmQ== X-Received: by 2002:a7b:c186:: with SMTP id y6mr3201789wmi.84.1616150316987; Fri, 19 Mar 2021 03:38:36 -0700 (PDT) Received: from [192.168.8.173] ([185.69.144.156]) by smtp.gmail.com with ESMTPSA id p27sm6079390wmi.12.2021.03.19.03.38.36 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 19 Mar 2021 03:38:36 -0700 (PDT) Subject: Re: [PATCH] io_uring: fix provide_buffers sign extension To: Colin Ian King , Jens Axboe , io-uring@vger.kernel.org References: <562376a39509e260d8532186a06226e56eb1f594.1616149233.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: <763d7d4f-5264-2db0-ee17-1b10699c095b@gmail.com> Date: Fri, 19 Mar 2021 10:34:38 +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: 8bit Precedence: bulk List-ID: X-Mailing-List: io-uring@vger.kernel.org On 19/03/2021 10:31, Colin Ian King wrote: > On 19/03/2021 10:21, Pavel Begunkov wrote: >> io_provide_buffers_prep()'s "p->len * p->nbufs" to sign extension >> problems. Not a huge problem as it's only used for access_ok() and >> increases the checked length, but better to keep typing right. >> >> Reported-by: Colin Ian King >> Fixes: efe68c1ca8f49 ("io_uring: validate the full range of provided buffers for access") >> Signed-off-by: Pavel Begunkov >> --- >> fs/io_uring.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/fs/io_uring.c b/fs/io_uring.c >> index c2489b463eb9..4f1c98502a09 100644 >> --- a/fs/io_uring.c >> +++ b/fs/io_uring.c >> @@ -3978,6 +3978,7 @@ static int io_remove_buffers(struct io_kiocb *req, unsigned int issue_flags) >> static int io_provide_buffers_prep(struct io_kiocb *req, >> const struct io_uring_sqe *sqe) >> { >> + unsigned long size; >> struct io_provide_buf *p = &req->pbuf; >> u64 tmp; >> >> @@ -3991,7 +3992,8 @@ static int io_provide_buffers_prep(struct io_kiocb *req, >> p->addr = READ_ONCE(sqe->addr); >> p->len = READ_ONCE(sqe->len); >> >> - if (!access_ok(u64_to_user_ptr(p->addr), (p->len * p->nbufs))) >> + size = (unsigned long)p->len * p->nbufs; >> + if (!access_ok(u64_to_user_ptr(p->addr), size)) >> return -EFAULT; >> >> p->bgid = READ_ONCE(sqe->buf_group); >> > > Does it make sense to make size a u64 and cast to a u64 rather than > unsigned long? static inline int __access_ok(unsigned long addr, unsigned long size) { return 1; } Not sure. I was thinking about size_t, but ended up sticking to access_ok types. -- Pavel Begunkov