linux-kernel - Re: [PATCH] drm/rockchip: fix dma_alloc

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: <CAGS+omALWyadW50tmU+FbfFGj9RgjQHeYqdEh5ZdWpJnMdnCyg@mail.gmail.com>
Date:	Fri, 9 Jan 2015 12:01:21 +0800
From:	Daniel Kurtz <djkurtz@...omium.org>
To:	Mark Yao <mark.yao@...k-chips.com>
Cc:	Pawel Osciak <posciak@...omium.org>,
	"open list:ARM/Rockchip SoC..." <linux-rockchip@...ts.infradead.org>,
	Daniel Kurtz <djkurtz@...omium.org>,
	David Airlie <airlied@...ux.ie>,
	Daniel Vetter <daniel@...ll.ch>,
	Rob Clark <robdclark@...il.com>,
	"open list:DRM DRIVERS" <dri-devel@...ts.freedesktop.org>,
	open list <linux-kernel@...r.kernel.org>
Subject: Re: [PATCH] drm/rockchip: fix dma_alloc_attrs() error check

On Wed, Jan 7, 2015 at 5:27 PM, Daniel Kurtz <djkurtz@...omium.org> wrote:
> dma_alloc_attrs() returns NULL if it cannot allocate a dma buffer (or
> mapping), not a negative error code.
>
> Rerported-by: Pawel Osciak <posciak@...omium.org>

Oops!  I just noticed that this is spelled wrong.  Should be "Reported-by".

Mark, could you fix up on your tree, or is it too late?

> Signed-off-by: Daniel Kurtz <djkurtz@...omium.org>
> ---
>  drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 +++------
>  1 file changed, 3 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index bc98a22..7ca8799e 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -34,12 +34,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj)
>         rk_obj->kvaddr = dma_alloc_attrs(drm->dev, obj->size,
>                                          &rk_obj->dma_addr, GFP_KERNEL,
>                                          &rk_obj->dma_attrs);
> -       if (IS_ERR(rk_obj->kvaddr)) {
> -               int ret = PTR_ERR(rk_obj->kvaddr);
> -
> -               DRM_ERROR("failed to allocate %#x byte dma buffer, %d",
> -                         obj->size, ret);
> -               return ret;
> +       if (!rk_obj->kvaddr) {
> +               DRM_ERROR("failed to allocate %#x byte dma buffer", obj->size);
> +               return -ENOMEM;
>         }
>
>         return 0;
> --
> 2.2.0.rc0.207.ga3a616c
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/