* [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors
@ 2018-01-17 15:16 Rob Clark
2018-01-17 15:31 ` Thomas Hellstrom
2018-01-17 22:14 ` Deepak Singh Rawat
0 siblings, 2 replies; 3+ messages in thread
From: Rob Clark @ 2018-01-17 15:16 UTC (permalink / raw)
To: dri-devel
Cc: Rob Clark, stable, VMware Graphics, Sinclair Yeh,
Thomas Hellstrom, David Airlie, linux-kernel
From: Rob Clark <rclark@redhat.com>
It looks like in all cases 'struct vmw_connector_state' is used. But
only in stdu connectors, was atomic_{duplicate,destroy}_state() properly
subclassed. Leading to writes beyond the end of the allocated connector
state block and all sorts of fun memory corruption related crashes.
Fixes: d7721ca71126 "drm/vmwgfx: Connector atomic state"
Cc: <stable@vger.kernel.org>
Signed-off-by: Rob Clark <rclark@redhat.com>
---
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 ++--
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index b8a09807c5de..3824595fece1 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -266,8 +266,8 @@ static const struct drm_connector_funcs vmw_legacy_connector_funcs = {
.set_property = vmw_du_connector_set_property,
.destroy = vmw_ldu_connector_destroy,
.reset = vmw_du_connector_reset,
- .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
- .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .atomic_duplicate_state = vmw_du_connector_duplicate_state,
+ .atomic_destroy_state = vmw_du_connector_destroy_state,
.atomic_set_property = vmw_du_connector_atomic_set_property,
.atomic_get_property = vmw_du_connector_atomic_get_property,
};
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index bc5f6026573d..63a4cd794b73 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -420,8 +420,8 @@ static const struct drm_connector_funcs vmw_sou_connector_funcs = {
.set_property = vmw_du_connector_set_property,
.destroy = vmw_sou_connector_destroy,
.reset = vmw_du_connector_reset,
- .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
- .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
+ .atomic_duplicate_state = vmw_du_connector_duplicate_state,
+ .atomic_destroy_state = vmw_du_connector_destroy_state,
.atomic_set_property = vmw_du_connector_atomic_set_property,
.atomic_get_property = vmw_du_connector_atomic_get_property,
};
--
2.14.3
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors
2018-01-17 15:16 [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors Rob Clark
@ 2018-01-17 15:31 ` Thomas Hellstrom
2018-01-17 22:14 ` Deepak Singh Rawat
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Hellstrom @ 2018-01-17 15:31 UTC (permalink / raw)
To: Rob Clark, dri-devel
Cc: Rob Clark, stable, VMware Graphics, Sinclair Yeh, David Airlie,
linux-kernel
On 01/17/2018 04:16 PM, Rob Clark wrote:
> From: Rob Clark <rclark@redhat.com>
>
> It looks like in all cases 'struct vmw_connector_state' is used. But
> only in stdu connectors, was atomic_{duplicate,destroy}_state() properly
> subclassed. Leading to writes beyond the end of the allocated connector
> state block and all sorts of fun memory corruption related crashes.
>
> Fixes: d7721ca71126 "drm/vmwgfx: Connector atomic state"
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Rob Clark <rclark@redhat.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
Thanks, Rob!
/Thomas
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 ++--
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index b8a09807c5de..3824595fece1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -266,8 +266,8 @@ static const struct drm_connector_funcs vmw_legacy_connector_funcs = {
> .set_property = vmw_du_connector_set_property,
> .destroy = vmw_ldu_connector_destroy,
> .reset = vmw_du_connector_reset,
> - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .atomic_duplicate_state = vmw_du_connector_duplicate_state,
> + .atomic_destroy_state = vmw_du_connector_destroy_state,
> .atomic_set_property = vmw_du_connector_atomic_set_property,
> .atomic_get_property = vmw_du_connector_atomic_get_property,
> };
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index bc5f6026573d..63a4cd794b73 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -420,8 +420,8 @@ static const struct drm_connector_funcs vmw_sou_connector_funcs = {
> .set_property = vmw_du_connector_set_property,
> .destroy = vmw_sou_connector_destroy,
> .reset = vmw_du_connector_reset,
> - .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> - .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> + .atomic_duplicate_state = vmw_du_connector_duplicate_state,
> + .atomic_destroy_state = vmw_du_connector_destroy_state,
> .atomic_set_property = vmw_du_connector_atomic_set_property,
> .atomic_get_property = vmw_du_connector_atomic_get_property,
> };
^ permalink raw reply [flat|nested] 3+ messages in thread* RE: [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors
2018-01-17 15:16 [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors Rob Clark
2018-01-17 15:31 ` Thomas Hellstrom
@ 2018-01-17 22:14 ` Deepak Singh Rawat
1 sibling, 0 replies; 3+ messages in thread
From: Deepak Singh Rawat @ 2018-01-17 22:14 UTC (permalink / raw)
To: Rob Clark, dri-devel@lists.freedesktop.org
Cc: Thomas Hellstrom, Rob Clark, David Airlie,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
linux-graphics-maintainer
Thanks Rob for finding this one.
Reviewed-by: Deepak Rawat <drawat@vmware.com>
> From: dri-devel [mailto:dri-devel-bounces@lists.freedesktop.org] On Behalf
> Of Rob Clark
> Sent: Wednesday, January 17, 2018 7:16 AM
> To: dri-devel@lists.freedesktop.org
> Cc: Thomas Hellstrom <thellstrom@vmware.com>; Rob Clark
> <rclark@redhat.com>; David Airlie <airlied@linux.ie>; linux-
> kernel@vger.kernel.org; stable@vger.kernel.org; linux-graphics-maintainer
> <linux-graphics-maintainer@vmware.com>
> Subject: [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou
> connectors
>
> From: Rob Clark <rclark@redhat.com>
>
> It looks like in all cases 'struct vmw_connector_state' is used. But
> only in stdu connectors, was atomic_{duplicate,destroy}_state() properly
> subclassed. Leading to writes beyond the end of the allocated connector
> state block and all sorts of fun memory corruption related crashes.
>
> Fixes: d7721ca71126 "drm/vmwgfx: Connector atomic state"
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Rob Clark <rclark@redhat.com>
> ---
> drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 4 ++--
> drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> index b8a09807c5de..3824595fece1 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
> @@ -266,8 +266,8 @@ static const struct drm_connector_funcs
> vmw_legacy_connector_funcs = {
> .set_property = vmw_du_connector_set_property,
> .destroy = vmw_ldu_connector_destroy,
> .reset = vmw_du_connector_reset,
> - .atomic_duplicate_state =
> drm_atomic_helper_connector_duplicate_state,
> - .atomic_destroy_state =
> drm_atomic_helper_connector_destroy_state,
> + .atomic_duplicate_state = vmw_du_connector_duplicate_state,
> + .atomic_destroy_state = vmw_du_connector_destroy_state,
> .atomic_set_property = vmw_du_connector_atomic_set_property,
> .atomic_get_property = vmw_du_connector_atomic_get_property,
> };
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> index bc5f6026573d..63a4cd794b73 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
> @@ -420,8 +420,8 @@ static const struct drm_connector_funcs
> vmw_sou_connector_funcs = {
> .set_property = vmw_du_connector_set_property,
> .destroy = vmw_sou_connector_destroy,
> .reset = vmw_du_connector_reset,
> - .atomic_duplicate_state =
> drm_atomic_helper_connector_duplicate_state,
> - .atomic_destroy_state =
> drm_atomic_helper_connector_destroy_state,
> + .atomic_duplicate_state = vmw_du_connector_duplicate_state,
> + .atomic_destroy_state = vmw_du_connector_destroy_state,
> .atomic_set_property = vmw_du_connector_atomic_set_property,
> .atomic_get_property = vmw_du_connector_atomic_get_property,
> };
> --
> 2.14.3
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://urldefense.proofpoint.com/v2/url?u=https-
> 3A__lists.freedesktop.org_mailman_listinfo_dri-
> 2Ddevel&d=DwIGaQ&c=uilaK90D4TOVoH58JNXRgQ&r=zOOG28inJK0762SxAf
> -
> cyZdStnd2NQpRu98lJP2iYGw&m=h6TncxsxWnJOk_7aZZClV8O_VZGw8rtrIk_
> BKtLUKM0&s=bizsNwniM18rOqG6MjlSY5t9fPsmxFrMgN_UqnI0vP0&e=
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-01-17 22:14 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-01-17 15:16 [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors Rob Clark
2018-01-17 15:31 ` Thomas Hellstrom
2018-01-17 22:14 ` Deepak Singh Rawat
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox