linux-kernel - Re: [PATCH 1/2] drm/ttm: use the same attributes when freeing d

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <6f28e750-02e4-438a-3680-a4697014689d@amd.com>
Date:   Tue, 16 Jul 2019 13:38:43 +0000
From:   "Koenig, Christian" <Christian.Koenig@....com>
To:     Fuqian Huang <huangfq.daxian@...il.com>
CC:     "Huang, Ray" <Ray.Huang@....com>,
        Junwei Zhang <Jerry.Zhang@....com>,
        David Airlie <airlied@...ux.ie>,
        Daniel Vetter <daniel@...ll.ch>,
        "dri-devel@...ts.freedesktop.org" <dri-devel@...ts.freedesktop.org>,
        "linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH 1/2] drm/ttm: use the same attributes when freeing
 d_page->vaddr

Am 11.07.19 um 05:10 schrieb Fuqian Huang:
> In function __ttm_dma_alloc_page(), d_page->addr is allocated
> by dma_alloc_attrs() but freed with use dma_free_coherent() in
> __ttm_dma_free_page().
> Use the correct dma_free_attrs() to free d_page->vaddr.
>
> Signed-off-by: Fuqian Huang <huangfq.daxian@...il.com>

Reviewed-by: Christian König <christian.koenig@....com>

How do you want to upstream that? Should I pull it into our tree?

Thanks,
Christian.

> ---
>   drivers/gpu/drm/ttm/ttm_page_alloc_dma.c | 6 +++++-
>   1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> index d594f7520b7b..7d78e6deac89 100644
> --- a/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> +++ b/drivers/gpu/drm/ttm/ttm_page_alloc_dma.c
> @@ -285,9 +285,13 @@ static int ttm_set_pages_caching(struct dma_pool *pool,
>   
>   static void __ttm_dma_free_page(struct dma_pool *pool, struct dma_page *d_page)
>   {
> +	unsigned long attrs = 0;
>   	dma_addr_t dma = d_page->dma;
>   	d_page->vaddr &= ~VADDR_FLAG_HUGE_POOL;
> -	dma_free_coherent(pool->dev, pool->size, (void *)d_page->vaddr, dma);
> +	if (pool->type & IS_HUGE)
> +		attrs = DMA_ATTR_NO_WARN;
> +
> +	dma_free_attrs(pool->dev, pool->size, (void *)d_page->vaddr, dma, attrs);
>   
>   	kfree(d_page);
>   	d_page = NULL;