Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Tue, 28 Jun 2022 09:50:13 -0600
From:   Alex Williamson <alex.williamson@redhat.com>
To:     Schspa Shi <schspa@gmail.com>
Cc:     cohuck@redhat.com, kvm@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH v2] vfio: Clear the caps->buf to NULL after free
Message-ID: <20220628095013.266d4a40.alex.williamson@redhat.com>
In-Reply-To: <20220628152429.286-1-schspa@gmail.com>
References: <20220628152429.286-1-schspa@gmail.com>
Organization: Red Hat
MIME-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Precedence: bulk

On Tue, 28 Jun 2022 23:24:29 +0800
Schspa Shi <schspa@gmail.com> wrote:

> API vfio_info_cap_add will free caps->buf, clear it to NULL after
> free.

Should this be something like:

    On buffer resize failure, vfio_info_cap_add() will free the buffer,
    report zero for the size, and return -ENOMEM.  As additional
    hardening, also clear the buffer pointer to prevent any chance of a
    double free.

Thanks,
Alex
 
> Signed-off-by: Schspa Shi <schspa@gmail.com>
> ---
>  drivers/vfio/vfio.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/vfio/vfio.c b/drivers/vfio/vfio.c
> index 61e71c1154be..a0fb93866f61 100644
> --- a/drivers/vfio/vfio.c
> +++ b/drivers/vfio/vfio.c
> @@ -1812,6 +1812,7 @@ struct vfio_info_cap_header *vfio_info_cap_add(struct vfio_info_cap *caps,
>  	buf = krealloc(caps->buf, caps->size + size, GFP_KERNEL);
>  	if (!buf) {
>  		kfree(caps->buf);
> +		caps->buf = NULL;
>  		caps->size = 0;
>  		return ERR_PTR(-ENOMEM);
>  	}