Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1617126

Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when dev_private is invalid

Show all headers | View raw

On Wed, Apr 05, 2017 at 04:29:26PM +0800, Jeffy Chen wrote:
> After unbinding drm, the userspace may still has a chance to access
> gem buf.
> 
> Add a sanity check for a NULL dev_private to prevent that from
> happening.

I still don't understand how this is happening. You're saying that these hooks
can be called after rockchip_drm_unbind() has finished? 

Sean

> 
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
> ---
> 
> Changes in v3:
> Address Daniel Vetter <daniel@ffwll.ch>'s comments.
> Update commit message.
> 
> Changes in v2: None
> 
>  drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 8 ++++++++
>  1 file changed, 8 insertions(+)
> 
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> index df9e570..205a3dc 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c
> @@ -184,6 +184,9 @@ static int rockchip_gem_alloc_buf(struct rockchip_gem_object *rk_obj,
>  	struct drm_device *drm = obj->dev;
>  	struct rockchip_drm_private *private = drm->dev_private;
>  
> +	if (!private)
> +		return -ENODEV;
> +
>  	if (private->domain)
>  		return rockchip_gem_alloc_iommu(rk_obj, alloc_kmap);
>  	else
> @@ -208,6 +211,11 @@ static void rockchip_gem_free_dma(struct rockchip_gem_object *rk_obj)
>  
>  static void rockchip_gem_free_buf(struct rockchip_gem_object *rk_obj)
>  {
> +	struct drm_device *drm = rk_obj->base.dev;
> +
> +	if (!drm->dev_private)
> +		return;
> +
>  	if (rk_obj->pages)
>  		rockchip_gem_free_iommu(rk_obj);
>  	else
> -- 
> 2.1.4
> 

-- 
Sean Paul, Software Engineer, Google / Chromium OS

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH v3 0/9] drm: rockchip: Fix rockchip drm unbind crash error Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
  [PATCH v3 2/9] drm: bridge: analogix: Unregister dp aux when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
    Re: [PATCH v3 2/9] drm: bridge: analogix: Unregister dp aux when  unbinding Andrzej Hajda <a.hajda@samsung.com> - 2017-04-06 09:20 +0200
      Re: [PATCH v3 2/9] drm: bridge: analogix: Unregister dp aux when  unbinding jeffy <jeffy.chen@rock-chips.com> - 2017-04-06 14:20 +0200
  [PATCH v3 3/9] drm: bridge: analogix: Destroy connector when unbinding Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
    Re: [PATCH v3 3/9] drm: bridge: analogix: Destroy connector when  unbinding Andrzej Hajda <a.hajda@samsung.com> - 2017-04-06 09:30 +0200
      Re: [PATCH v3 3/9] drm: bridge: analogix: Destroy connector when  unbinding jeffy <jeffy.chen@rock-chips.com> - 2017-04-06 14:30 +0200
  [PATCH v3 4/9] drm/rockchip: cdn-dp: Don't try to release firmware when not loaded Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
  [PATCH v3 6/9] drm/rockchip: Reoder drm bind/unbind sequence Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
  [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when dev_private is invalid Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
    Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid Sean Paul <seanpaul@chromium.org> - 2017-04-05 18:40 +0200
      Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid jeffy <jeffy.chen@rock-chips.com> - 2017-04-06 05:00 +0200
        Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid Sean Paul <seanpaul@chromium.org> - 2017-04-06 14:30 +0200
          Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid jeffy <jeffy.chen@rock-chips.com> - 2017-04-06 15:00 +0200
      Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid Daniel Vetter <daniel@ffwll.ch> - 2017-04-06 10:30 +0200
        Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid jeffy <jeffy.chen@rock-chips.com> - 2017-04-06 13:20 +0200
          Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid Daniel Vetter <daniel@ffwll.ch> - 2017-04-07 08:40 +0200
            Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid jeffy <jeffy.chen@rock-chips.com> - 2017-04-07 08:50 +0200
              Re: [PATCH v3 8/9] drm/rockchip: gem: Don't alloc/free gem buf when  dev_private is invalid Daniel Vetter <daniel@ffwll.ch> - 2017-04-07 09:20 +0200
  [PATCH v3 7/9] drm/rockchip: Shutdown all crtcs when unbinding drm Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
  [PATCH v3 1/9] drm: bridge: analogix: Detach panel when unbinding analogix dp Jeffy Chen <jeffy.chen@rock-chips.com> - 2017-04-05 10:40 +0200
    Re: [PATCH v3 1/9] drm: bridge: analogix: Detach panel when unbinding  analogix dp Andrzej Hajda <a.hajda@samsung.com> - 2017-04-06 09:00 +0200

csiph-web