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> <CAMj1kXE7soPKnsRPjB5HfUZ4MhAVX_ejbidozyOFrj4AfROjPg@mail.gmail.com>
 <CAMV6ehETfqcZS=e4Fk82neOwNJH8Qm+AXXihRQYAPfS4aqjVGg@mail.gmail.com>
In-Reply-To: <CAMV6ehETfqcZS=e4Fk82neOwNJH8Qm+AXXihRQYAPfS4aqjVGg@mail.gmail.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Mon, 15 Jun 2020 11:48:53 +0200
Message-ID: <CAMj1kXHhu3Vpk9239v1QeiGVsG1JmYVvQm-4W+78=wq4aouPbw@mail.gmail.com>
Subject: Re: [PATCH] efi/esrt: Fix reference count leak in esre_create_sysfs_entry.
To:     Qiushi Wu <wu000273@umn.edu>
Cc:     Kangjie Lu <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 Sat, 30 May 2020 at 06:23, Qiushi Wu <wu000273@umn.edu> wrote:
>
> Thanks for your reply!
>  > Why are you removing this kfree() call?
>
> Because  kobject_put(&entry->kobj) will call kobject_release(), which will call kobject_cleanup(), which will dynamically call get_ktype(kobj)->release(kobj); .
> In this case, the "release" function is defined as:
> static struct kobj_type esre1_ktype = {
> .release = esre_release.
> ...
> };
>
> and esre_release() is defined as :
> static void esre_release(struct kobject *kobj) {
>            struct esre_entry *entry = to_entry(kobj);
>            list_del(&entry->list);
>            kfree(entry);
> }
>
> In this case, if we call both kobject_put() and kfree(), a double-free will be introduced.
>

Thanks for the explanation

Queued in efi/urgent.

> On Fri, May 29, 2020 at 12:00 PM Ard Biesheuvel <ardb@kernel.org> wrote:
>>
>> 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
>> >