git.openwrt.org Git - openwrt/staging/981213.git/blob

   1 From 98917e88ec975eee0194ca011479e507029009ae Mon Sep 17 00:00:00 2001
   2 From: Liu Ying <victor.liu@nxp.com>
   3 Date: Tue, 30 Jul 2019 13:13:16 +0800
   4 Subject: [PATCH] MLK-22171 drm/imx: Avoid leaking dangling pointer
   5  dev->driver_data to PM ops
   6
   7 In case ->bind() fails, we should avoid leaking dangling pointer
   8 dev->driver_data which is set by dev_set_drvdata(), otherwise
   9 it would be leaked, and seen/dereferenced by PM ops, thus hang
  10 happens.  Moving dev_set_drvdata() down just before ->bind()
  11 successfully returns may address this issue.
  12
  13 Signed-off-by: Liu Ying <victor.liu@nxp.com>
  14 ---
  15  drivers/gpu/drm/imx/imx-drm-core.c | 4 ++--
  16  1 file changed, 2 insertions(+), 2 deletions(-)
  17
  18 --- a/drivers/gpu/drm/imx/imx-drm-core.c
  19 +++ b/drivers/gpu/drm/imx/imx-drm-core.c
  20 @@ -158,8 +158,6 @@ static int imx_drm_bind(struct device *d
  21         if (ret)
  22                 goto err_kms;
  23
  24 -       dev_set_drvdata(dev, drm);
  25 -
  26         /* Now try and bind all our sub-components */
  27         ret = component_bind_all(dev, drm);
  28         if (ret)
  29 @@ -185,6 +183,8 @@ static int imx_drm_bind(struct device *d
  30
  31         drm_fbdev_generic_setup(drm, legacyfb_depth);
  32
  33 +       dev_set_drvdata(dev, drm);
  34 +
  35         return 0;
  36
  37  err_poll_fini: