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: <20210618075925.803052-1-cccheng@synology.com> <20210622060419.GA29360@lst.de>
In-Reply-To: <20210622060419.GA29360@lst.de>
From:   Chung-Chiang Cheng <shepjeng@gmail.com>
Date:   Tue, 22 Jun 2021 15:40:13 +0800
Message-ID: <CAHuHWt=2ZoQJz1tVpJ7SzqUDwPXthNHksq2-uTFCzHmv+E7qWA@mail.gmail.com>
Subject: Re: [PATCH] configfs: fix memleak in configfs_release_bin_file
To:     Christoph Hellwig <hch@lst.de>
Cc:     jlbec@evilplan.org,
        Pantelis Antoniou <pantelis.antoniou@konsulko.com>,
        linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org,
        Chung-Chiang Cheng <cccheng@synology.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

It works for me. I've verified it with ACPI configfs that is the only
one using configfs binary attributes so far, and the memleak issue
is solved.

On Tue, Jun 22, 2021 at 2:04 PM Christoph Hellwig <hch@lst.de> wrote:
>
> Hmm.  The issue looks real, but I think we should just call the vfree
> unconditionally given that the buffer structure is zeroed on allocation
> and freed just after, and also remove the pointless clearing of all the
> flags.  Does something like this work for you?
>
> diff --git a/fs/configfs/file.c b/fs/configfs/file.c
> index 53913b84383a..1ab6afb84f04 100644
> --- a/fs/configfs/file.c
> +++ b/fs/configfs/file.c
> @@ -393,11 +393,8 @@ static int configfs_release_bin_file(struct inode *inode, struct file *file)
>  {
>         struct configfs_buffer *buffer = file->private_data;
>
> -       buffer->read_in_progress = false;
> -
>         if (buffer->write_in_progress) {
>                 struct configfs_fragment *frag = to_frag(file);
> -               buffer->write_in_progress = false;
>
>                 down_read(&frag->frag_sem);
>                 if (!frag->frag_dead) {
> @@ -407,13 +404,9 @@ static int configfs_release_bin_file(struct inode *inode, struct file *file)
>                                         buffer->bin_buffer_size);
>                 }
>                 up_read(&frag->frag_sem);
> -               /* vfree on NULL is safe */
> -               vfree(buffer->bin_buffer);
> -               buffer->bin_buffer = NULL;
> -               buffer->bin_buffer_size = 0;
> -               buffer->needs_read_fill = 1;
>         }
>
> +       vfree(buffer->bin_buffer);
>         configfs_release(inode, file);
>         return 0;
>  }