[PATCH] drm/vmwgfx: fix memory corruption with legacy/sou connectors

[Thomas Hellstrom]

On 01/17/2018 04:16 PM, Rob Clark wrote:
> From: Rob Clark <rclark at 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 at vger.kernel.org>
> Signed-off-by: Rob Clark <rclark at redhat.com>
Reviewed-by: Thomas Hellstrom <thellstrom at 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,
>   };