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=-12.7 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,SPF_HELO_NONE,SPF_PASS 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 A94C0C433F5 for ; Fri, 10 Sep 2021 10:50:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 8872461100 for ; Fri, 10 Sep 2021 10:50:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232442AbhIJKvd (ORCPT ); Fri, 10 Sep 2021 06:51:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36182 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232415AbhIJKvd (ORCPT ); Fri, 10 Sep 2021 06:51:33 -0400 Received: from mail-lf1-x12e.google.com (mail-lf1-x12e.google.com [IPv6:2a00:1450:4864:20::12e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 37CAAC061574; Fri, 10 Sep 2021 03:50:22 -0700 (PDT) Received: by mail-lf1-x12e.google.com with SMTP id s10so3143806lfr.11; Fri, 10 Sep 2021 03:50:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=eKzR9oqZtxb76e9ajCaeipteTFurfCH3JAineo6pIuM=; b=VJ6fhld+oMLvdqeJZJ4x+KXrdwelIlyHC6Y1HU9DXoN9zQagksco0D3jSyu7brffEL qqGLIVxK139LXLhvwHlPB1YD+Nbq498Z2BKU/0H/bRQhy9FTzxSgmzy2peIstkWmnzgC rwUJKpqiJGsXEFobGoqVT4BaCMggfJ2klvjAtlPINHqus8eM55kWkJWem7udMndHxh8b eryJxzjyTnrndyQlik14jaD6xoaWMAEfNfmZWTzNb2VMC095MfY8Aln8//ex/25LWd6x z8I9rVdeX7kpehWcLRys9/Z4c33/G3zs0TvBAfpvIgDbpsY6KWE9mYd4ogVLIUaXhX+D 896Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=eKzR9oqZtxb76e9ajCaeipteTFurfCH3JAineo6pIuM=; b=Sr3Mu5fHRmn+RJO+4am3X6/BCl+JO1CeVjBBvJDC8J30SPRAnQce0Y4GVZqSbwtzNC LMI5zkuwiWN0zdlX1konFU+B++WpZEZWxSdl7ur3obcXm1K+cpDIvqXeG8XyeqYt41kY XFl8icXBH6o6qUPw1j0BAVVaAXPcxj+hSIGAG3EQt0XtOaZ7FDWWWggvRM1l+BGpgKo/ SaDo4Y8AsFQzJaB93aIP0k1/cbUPq05rQWi3yYjvv74IibtXB24hNTcKv8Kmojz2UI+o VwLhgMn4Y8o3MZDuN58pQ1luX2XOJkK+5IXHqQFQopMQTIr5E5pQUeG1LZuJY6XO0Bov A+pw== X-Gm-Message-State: AOAM530Q1UtsHAYAUp3EP+gsYdZpzSVuyqQPRgGn5oUy+MzAqgowRNqZ NH2kGABGEUMJ+/0EsWsuWPI= X-Google-Smtp-Source: ABdhPJx4g/HVf1ebfdBtL/JfNxGhY6W+Q0U4hjhZol5YQdSf8f3MtKVIR+0Kn3ZWjKrx/qFlC/tkjg== X-Received: by 2002:a05:6512:2202:: with SMTP id h2mr3411408lfu.494.1631271020592; Fri, 10 Sep 2021 03:50:20 -0700 (PDT) Received: from kari-VirtualBox ([31.132.12.44]) by smtp.gmail.com with ESMTPSA id z16sm535665lfu.110.2021.09.10.03.50.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Sep 2021 03:50:20 -0700 (PDT) Date: Fri, 10 Sep 2021 13:50:18 +0300 From: Kari Argillander To: Colin King Cc: Konstantin Komarov , ntfs3@lists.linux.dev, kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH][next] fs/ntfs3: Fix a memory leak on object opts Message-ID: <20210910105018.asvmzihjdqeqm25v@kari-VirtualBox> References: <20210910100202.29254-1-colin.king@canonical.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20210910100202.29254-1-colin.king@canonical.com> Precedence: bulk List-ID: X-Mailing-List: kernel-janitors@vger.kernel.org On Fri, Sep 10, 2021 at 11:02:02AM +0100, Colin King wrote: > From: Colin Ian King > > Currently a failed allocation on sbi->upcase will cause an exit via > the label free_sbi causing a memory leak on object opts. Fix this by > re-ordering the exit paths free_opts and free_sbi so that kfree's occur > in the reverse allocation order. > > Addresses-Coverity: ("Resource leak") > Fixes: 27fac77707a1 ("fs/ntfs3: Init spi more in init_fs_context than fill_super") > Signed-off-by: Colin Ian King > --- Thanks Colin. Reviewed-by: Kari Argillander > fs/ntfs3/super.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/fs/ntfs3/super.c b/fs/ntfs3/super.c > index 3cba0b5e7ac7..69f23db0d727 100644 > --- a/fs/ntfs3/super.c > +++ b/fs/ntfs3/super.c > @@ -1450,10 +1450,10 @@ static int ntfs_init_fs_context(struct fs_context *fc) > fc->ops = &ntfs_context_ops; > > return 0; > -free_opts: > - kfree(opts); > free_sbi: > kfree(sbi); > +free_opts: > + kfree(opts); > return -ENOMEM; > } > > -- > 2.32.0 >