Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20200528183804.4497-1-wu000273@umn.edu>
In-Reply-To: <20200528183804.4497-1-wu000273@umn.edu>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Fri, 29 May 2020 19:00:34 +0200
Message-ID: <CAMj1kXE7soPKnsRPjB5HfUZ4MhAVX_ejbidozyOFrj4AfROjPg@mail.gmail.com>
Subject: Re: [PATCH] efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
To:     wu000273@umn.edu
Cc:     kjlu@umn.edu, Peter Jones <pjones@redhat.com>,
        Matt Fleming <matt.fleming@intel.com>,
        linux-efi <linux-efi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

On Thu, 28 May 2020 at 20:38, <wu000273@umn.edu> wrote:
>
> From: Qiushi Wu <wu000273@umn.edu>
>
> kobject_init_and_add() takes reference even when it fails.
> If this function returns an error, kobject_put() must be called to
> properly clean up the memory associated with the object. Previous
> commit "b8eb718348b8" fixed a similar problem.
>
> Fixes: 0bb549052d33 ("efi: Add esrt support")
> Signed-off-by: Qiushi Wu <wu000273@umn.edu>
> ---
>  drivers/firmware/efi/esrt.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
> index e3d692696583..d5915272141f 100644
> --- a/drivers/firmware/efi/esrt.c
> +++ b/drivers/firmware/efi/esrt.c
> @@ -181,7 +181,7 @@ static int esre_create_sysfs_entry(void *esre, int entry_num)
>                 rc = kobject_init_and_add(&entry->kobj, &esre1_ktype, NULL,
>                                           "entry%d", entry_num);
>                 if (rc) {
> -                       kfree(entry);

Why are you removing this kfree() call?

> +                       kobject_put(&entry->kobj);
>                         return rc;
>                 }
>         }
> --
> 2.17.1
>