* [PATCH] drm/rockchip: Fix suspend crash when drm is not bound
@ 2017-08-09 10:41 Jeffy Chen
2017-08-09 18:09 ` Sean Paul
0 siblings, 1 reply; 3+ messages in thread
From: Jeffy Chen @ 2017-08-09 10:41 UTC (permalink / raw)
To: linux-kernel, seanpaul, mark.yao; +Cc: briannorris, dianders, Jeffy Chen
Currently we are allocating drm_device in rockchip_drm_bind, so if the
suspend/resume code access it when drm is not bound, we would hit this
crash:
[ 253.402836] Unable to handle kernel NULL pointer dereference at virtual address 00000028
[ 253.402837] pgd = ffffffc06c9b0000
[ 253.402841] [00000028] *pgd=0000000000000000, *pud=0000000000000000
[ 253.402844] Internal error: Oops: 96000005 [#1] PREEMPT SMP
[ 253.402859] Modules linked in: btusb btrtl btbcm btintel bluetooth ath10k_pci ath10k_core ar10k_ath ar10k_mac80211 cfg80211 ip6table_filter asix usbnet mii
[ 253.402864] CPU: 4 PID: 1331 Comm: cat Not tainted 4.4.70 #15
[ 253.402865] Hardware name: Google Scarlet (DT)
[ 253.402867] task: ffffffc076c0ce00 ti: ffffffc06c2c8000 task.ti: ffffffc06c2c8000
[ 253.402871] PC is at rockchip_drm_sys_suspend+0x20/0x5c
Add sanity checks to prevent that.
Reported-by: Brian Norris <briannorris@chromium.com>
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
---
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
index c41f48a..ff3d0f5 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
@@ -270,11 +270,15 @@ static void rockchip_drm_fb_resume(struct drm_device *drm)
static int rockchip_drm_sys_suspend(struct device *dev)
{
struct drm_device *drm = dev_get_drvdata(dev);
- struct rockchip_drm_private *priv = drm->dev_private;
+ struct rockchip_drm_private *priv;
+
+ if (!drm)
+ return 0;
drm_kms_helper_poll_disable(drm);
rockchip_drm_fb_suspend(drm);
+ priv = drm->dev_private;
priv->state = drm_atomic_helper_suspend(drm);
if (IS_ERR(priv->state)) {
rockchip_drm_fb_resume(drm);
@@ -288,8 +292,12 @@ static int rockchip_drm_sys_suspend(struct device *dev)
static int rockchip_drm_sys_resume(struct device *dev)
{
struct drm_device *drm = dev_get_drvdata(dev);
- struct rockchip_drm_private *priv = drm->dev_private;
+ struct rockchip_drm_private *priv;
+
+ if (!drm)
+ return 0;
+ priv = drm->dev_private;
drm_atomic_helper_resume(drm, priv->state);
rockchip_drm_fb_resume(drm);
drm_kms_helper_poll_enable(drm);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: Fix suspend crash when drm is not bound
2017-08-09 10:41 [PATCH] drm/rockchip: Fix suspend crash when drm is not bound Jeffy Chen
@ 2017-08-09 18:09 ` Sean Paul
0 siblings, 0 replies; 3+ messages in thread
From: Sean Paul @ 2017-08-09 18:09 UTC (permalink / raw)
To: Jeffy Chen
Cc: Linux Kernel Mailing List, Mark yao, Brian Norris, Doug Anderson,
dri-devel
On Wed, Aug 9, 2017 at 6:41 AM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote:
> Currently we are allocating drm_device in rockchip_drm_bind, so if the
> suspend/resume code access it when drm is not bound, we would hit this
> crash:
>
> [ 253.402836] Unable to handle kernel NULL pointer dereference at virtual address 00000028
> [ 253.402837] pgd = ffffffc06c9b0000
> [ 253.402841] [00000028] *pgd=0000000000000000, *pud=0000000000000000
> [ 253.402844] Internal error: Oops: 96000005 [#1] PREEMPT SMP
> [ 253.402859] Modules linked in: btusb btrtl btbcm btintel bluetooth ath10k_pci ath10k_core ar10k_ath ar10k_mac80211 cfg80211 ip6table_filter asix usbnet mii
> [ 253.402864] CPU: 4 PID: 1331 Comm: cat Not tainted 4.4.70 #15
> [ 253.402865] Hardware name: Google Scarlet (DT)
> [ 253.402867] task: ffffffc076c0ce00 ti: ffffffc06c2c8000 task.ti: ffffffc06c2c8000
> [ 253.402871] PC is at rockchip_drm_sys_suspend+0x20/0x5c
>
> Add sanity checks to prevent that.
>
> Reported-by: Brian Norris <briannorris@chromium.com>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
>
Hi Jeffy,
Thank you for the patch. In future, please also Cc dri-devel for more
visibility (I've added them to this reply).
I've applied the patch to drm-misc-fixes.
Sean
> ---
>
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index c41f48a..ff3d0f5 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -270,11 +270,15 @@ static void rockchip_drm_fb_resume(struct drm_device *drm)
> static int rockchip_drm_sys_suspend(struct device *dev)
> {
> struct drm_device *drm = dev_get_drvdata(dev);
> - struct rockchip_drm_private *priv = drm->dev_private;
> + struct rockchip_drm_private *priv;
> +
> + if (!drm)
> + return 0;
>
> drm_kms_helper_poll_disable(drm);
> rockchip_drm_fb_suspend(drm);
>
> + priv = drm->dev_private;
> priv->state = drm_atomic_helper_suspend(drm);
> if (IS_ERR(priv->state)) {
> rockchip_drm_fb_resume(drm);
> @@ -288,8 +292,12 @@ static int rockchip_drm_sys_suspend(struct device *dev)
> static int rockchip_drm_sys_resume(struct device *dev)
> {
> struct drm_device *drm = dev_get_drvdata(dev);
> - struct rockchip_drm_private *priv = drm->dev_private;
> + struct rockchip_drm_private *priv;
> +
> + if (!drm)
> + return 0;
>
> + priv = drm->dev_private;
> drm_atomic_helper_resume(drm, priv->state);
> rockchip_drm_fb_resume(drm);
> drm_kms_helper_poll_enable(drm);
> --
> 2.1.4
>
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/rockchip: Fix suspend crash when drm is not bound
@ 2017-08-09 18:09 ` Sean Paul
0 siblings, 0 replies; 3+ messages in thread
From: Sean Paul @ 2017-08-09 18:09 UTC (permalink / raw)
To: Jeffy Chen
Cc: Doug Anderson, Brian Norris, Linux Kernel Mailing List, dri-devel
On Wed, Aug 9, 2017 at 6:41 AM, Jeffy Chen <jeffy.chen@rock-chips.com> wrote:
> Currently we are allocating drm_device in rockchip_drm_bind, so if the
> suspend/resume code access it when drm is not bound, we would hit this
> crash:
>
> [ 253.402836] Unable to handle kernel NULL pointer dereference at virtual address 00000028
> [ 253.402837] pgd = ffffffc06c9b0000
> [ 253.402841] [00000028] *pgd=0000000000000000, *pud=0000000000000000
> [ 253.402844] Internal error: Oops: 96000005 [#1] PREEMPT SMP
> [ 253.402859] Modules linked in: btusb btrtl btbcm btintel bluetooth ath10k_pci ath10k_core ar10k_ath ar10k_mac80211 cfg80211 ip6table_filter asix usbnet mii
> [ 253.402864] CPU: 4 PID: 1331 Comm: cat Not tainted 4.4.70 #15
> [ 253.402865] Hardware name: Google Scarlet (DT)
> [ 253.402867] task: ffffffc076c0ce00 ti: ffffffc06c2c8000 task.ti: ffffffc06c2c8000
> [ 253.402871] PC is at rockchip_drm_sys_suspend+0x20/0x5c
>
> Add sanity checks to prevent that.
>
> Reported-by: Brian Norris <briannorris@chromium.com>
> Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
>
Hi Jeffy,
Thank you for the patch. In future, please also Cc dri-devel for more
visibility (I've added them to this reply).
I've applied the patch to drm-misc-fixes.
Sean
> ---
>
> drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 12 ++++++++++--
> 1 file changed, 10 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> index c41f48a..ff3d0f5 100644
> --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c
> @@ -270,11 +270,15 @@ static void rockchip_drm_fb_resume(struct drm_device *drm)
> static int rockchip_drm_sys_suspend(struct device *dev)
> {
> struct drm_device *drm = dev_get_drvdata(dev);
> - struct rockchip_drm_private *priv = drm->dev_private;
> + struct rockchip_drm_private *priv;
> +
> + if (!drm)
> + return 0;
>
> drm_kms_helper_poll_disable(drm);
> rockchip_drm_fb_suspend(drm);
>
> + priv = drm->dev_private;
> priv->state = drm_atomic_helper_suspend(drm);
> if (IS_ERR(priv->state)) {
> rockchip_drm_fb_resume(drm);
> @@ -288,8 +292,12 @@ static int rockchip_drm_sys_suspend(struct device *dev)
> static int rockchip_drm_sys_resume(struct device *dev)
> {
> struct drm_device *drm = dev_get_drvdata(dev);
> - struct rockchip_drm_private *priv = drm->dev_private;
> + struct rockchip_drm_private *priv;
> +
> + if (!drm)
> + return 0;
>
> + priv = drm->dev_private;
> drm_atomic_helper_resume(drm, priv->state);
> rockchip_drm_fb_resume(drm);
> drm_kms_helper_poll_enable(drm);
> --
> 2.1.4
>
>
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-08-09 18:10 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-08-09 10:41 [PATCH] drm/rockchip: Fix suspend crash when drm is not bound Jeffy Chen
2017-08-09 18:09 ` Sean Paul
2017-08-09 18:09 ` Sean Paul
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.