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=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 9A184C433ED for ; Thu, 29 Apr 2021 10:41:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 56F2161458 for ; Thu, 29 Apr 2021 10:41:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233219AbhD2KmU (ORCPT ); Thu, 29 Apr 2021 06:42:20 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46414 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232245AbhD2KmT (ORCPT ); Thu, 29 Apr 2021 06:42:19 -0400 Received: from mail-wr1-x434.google.com (mail-wr1-x434.google.com [IPv6:2a00:1450:4864:20::434]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6550DC06138B; Thu, 29 Apr 2021 03:41:33 -0700 (PDT) Received: by mail-wr1-x434.google.com with SMTP id a4so66398884wrr.2; Thu, 29 Apr 2021 03:41:33 -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=REZoex94nDPpipmexh8x+anc7wXyq42sIDmrWVd+E4E=; b=Eox34uCxdNUwS2dzIsT2F9Cx+PE+MRH5UfXzYVwGKOWb1NxMievaRdJZ04r2nshq9y Tx7DxmJW8sYR3o+CmGGoT5khjFIv8Q+9jKNW/mc3E+YcKfPLUJEBzdkOPZmrgi0smIsR 2329Pt3m2FokjXoMV7pn4UvNrD6jz859GTCBpRT6Ob3I9s3czsj7D2d0GOaWAVRz2Yns UUKwO1K+qQi17/M3kMZR2OK2Bl6vXqDWLRa8PLwPT4bdJuKknJ18aKDj0xHm3w/ajBKp 4yOrRLlI0O7/+TcKX4z6AifEME6FgWsCa55MMiIXlG+44bPO3uKar5PqZ1LmFILongHK sauw== 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=REZoex94nDPpipmexh8x+anc7wXyq42sIDmrWVd+E4E=; b=JuoZbOlkeWGGFdp2/DVuGE3ROxf8FkhF+BD6yFAz6AlQ9DLFssXHbWrjlaF04O45Pp /LMQwynmivi5wKECBdvWlDch5BKKMM/QCtIVXUWq9lfXHjAo3OksM74PmW7ERQbfKCSZ P9piNS4J2DAXP2YQOrQImpOctM5x6BDg3eA1gjMIvOlsEnhG2QB0GilzOmAWQeMtyab9 FGE7EEPRQxshvO9FQX4vjfRLxNLEIZGGdHcqw8EuQOz4VbZOJbaD22AAk4d0Rbbc2270 2mjiW8n4PAdKh/PkF/RnvCRJ5mKREhZq7ZT0FBudWZZnTkRNqwMLQjFjSmms28p0Jhib j90A== X-Gm-Message-State: AOAM5322MvHjuclzyXQJIjjs3lf+kXskamA3k8/Ce5AeAs0pBgtHMRMl bYsmqDAbFQDIsLBRR/7tomThK0rCcKE= X-Google-Smtp-Source: ABdhPJw2JO/LXtxSZ9tvZoEIQ1VPjgXjqZgvLZvz5FHimdiE6knhHHeSqM0L8GdwgjkBYREXhFKFTg== X-Received: by 2002:adf:e907:: with SMTP id f7mr33531332wrm.86.1619692891904; Thu, 29 Apr 2021 03:41:31 -0700 (PDT) Received: from [192.168.8.197] ([148.252.132.80]) by smtp.gmail.com with ESMTPSA id x8sm4307974wru.70.2021.04.29.03.41.30 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 29 Apr 2021 03:41:31 -0700 (PDT) Subject: Re: [PATCH][next] io_uring: Fix memory leak on error return path. To: Colin Ian 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> <6929b598-ac2f-521a-8e96-dbbf295d137a@gmail.com> <0aa1bcfe-9e45-ac54-1292-43caad8b9b06@canonical.com> From: Pavel Begunkov Message-ID: <36a3806a-ca15-b362-2084-75f6787b0412@gmail.com> Date: Thu, 29 Apr 2021 11:41:26 +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: <0aa1bcfe-9e45-ac54-1292-43caad8b9b06@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:36 AM, Colin Ian King wrote: > On 29/04/2021 11:32, Pavel Begunkov wrote: >> 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; > Ah, thanks. > >> >> Colin, can you resend with the change? > > Will do in a moment or so. Hmm, there are actually two of them, look for "iov.iov_base && tag" >> >>> >>> ret = io_sqe_buffer_register(ctx, &iov, &ctx->user_bufs[i], >>> &last_hpage); >>> >> > -- Pavel Begunkov