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.2 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,URIBL_BLOCKED, USER_AGENT_SANE_1 autolearn=unavailable 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 65F4FC4360C for ; Thu, 29 Apr 2021 10:32:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2B85F6145A for ; Thu, 29 Apr 2021 10:32:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S240449AbhD2KdJ (ORCPT ); Thu, 29 Apr 2021 06:33:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240272AbhD2KdH (ORCPT ); Thu, 29 Apr 2021 06:33:07 -0400 Received: from mail-wm1-x331.google.com (mail-wm1-x331.google.com [IPv6:2a00:1450:4864:20::331]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 94CEEC06138B; Thu, 29 Apr 2021 03:32:20 -0700 (PDT) Received: by mail-wm1-x331.google.com with SMTP id b19-20020a05600c06d3b029014258a636e8so6334687wmn.2; Thu, 29 Apr 2021 03:32:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=GbXkdlBZbDXm3nWFnvDWM+vsQZ7k+H4Y2BPygrAm+f8=; b=tHGtaRl0XFjOkbv9KxHi47FQ9wm57KtVLwyun1Rm2En/FH3CvdTzc0jgzdopPad88h wWzKLyb4s4/Sed0RwaHUJnRLFRlxzKu4FgABsVsGOiWF0KvjjGzn94wibriIvwDYsgqw Pr4DXwQog/jZXaT6dgUki9BY8iFjh7Bvh0AB4lEnClqGp2Lz/peTakipjt8eLH7Hl2uL t+sd1Owl9IfccBYnLRT2s8drPo6wFtDr8I03QLRLiNM3b8wNTVd5tN710Jdk4GE1yQIo 8GhapvFNclM0E6LHo00At7s8IiW5RJCmBtQ7W0ofq27OQDQss/tghw7aTfJYdhRIj9pc sweQ== 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:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=GbXkdlBZbDXm3nWFnvDWM+vsQZ7k+H4Y2BPygrAm+f8=; b=oYq60EKEnY64wGauO08Lio01ajOZsNY1okTgJ635Do0NJsWeOOJH3QlnTf0L91rAFE h10Namfwh8YCk1qCvt1iLAmJ/13BklvX5P7D/Ouz5U1qZYdXbXDJF3pkWbTDNPVKaGkU /8qO+/y4oYOlrdga/jyHIDVNHx6/SrN/E3nv2ITM0fomIE5p7CGp/+GDUW4C+ZZRRVQp PFoKCkt2B5kqNAO2aCSJW+QjdEXEy6x6etdcY7GECY6SA7PkdiMIKah0xV844J/irkOy BWorIqIWQfTsH6kOnk2IQnmtxX+3vRkLshTvDIs/6RHuC4Z1IC2OOdlLIhGGw7Wmpmrw JSmA== X-Gm-Message-State: AOAM531M4yv06tCnfbaGIqyJ/09eS5K9DJjdm6QisHbORBXHv+AAmRAs LyyzDMvPHQy4tKN0ubr2IdsFIBkhs9c= X-Google-Smtp-Source: ABdhPJy2H3OLhiiKfpmXHW2Z4j4ElI9PQjtTxGeRdK4Q3i5r0ZUXk3VubEyEpAZ/LSDYzFOVQDVCjw== X-Received: by 2002:a1c:6382:: with SMTP id x124mr9628040wmb.142.1619692339104; Thu, 29 Apr 2021 03:32:19 -0700 (PDT) Received: from [192.168.8.197] ([148.252.132.80]) by smtp.gmail.com with ESMTPSA id n10sm4129299wrw.37.2021.04.29.03.32.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Apr 2021 03:32:18 -0700 (PDT) Subject: Re: [PATCH][next] io_uring: Fix memory leak on error return path. To: Colin King , Jens Axboe , io-uring@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org References: <20210429102654.58943-1-colin.king@canonical.com> From: Pavel Begunkov Message-ID: <6929b598-ac2f-521a-8e96-dbbf295d137a@gmail.com> Date: Thu, 29 Apr 2021 11:32:13 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.9.1 MIME-Version: 1.0 In-Reply-To: <20210429102654.58943-1-colin.king@canonical.com> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On 4/29/21 11:26 AM, Colin King wrote: > From: Colin Ian King > > Currently the -EINVAL error return path is leaking memory allocated > to data. Fix this by kfree'ing data before the return. > > Addresses-Coverity: ("Resource leak") > Fixes: c3a40789f6ba ("io_uring: allow empty slots for reg buffers") > Signed-off-by: Colin Ian King > --- > 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 47c2f126f885..beeb477e4f6a 100644 > --- a/fs/io_uring.c > +++ b/fs/io_uring.c > @@ -8417,8 +8417,10 @@ static int io_sqe_buffers_register(struct io_ring_ctx *ctx, void __user *arg, > ret = io_buffer_validate(&iov); > if (ret) > break; > - if (!iov.iov_base && tag) > + if (!iov.iov_base && tag) {> + kfree(data); > return -EINVAL; > + } Buggy indeed, should have been: ret = -EINVAL; break; Colin, can you resend with the change? > > ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i], > &last_hpage); > -- Pavel Begunkov