Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] drm/vmwgfx: fix memory corruption with legacy/sou
 connectors
To:     Rob Clark <robdclark@gmail.com>, dri-devel@lists.freedesktop.org
Cc:     Rob Clark <rclark@redhat.com>, stable@vger.kernel.org,
        VMware Graphics <linux-graphics-maintainer@vmware.com>,
        Sinclair Yeh <syeh@vmware.com>,
        David Airlie <airlied@linux.ie>, linux-kernel@vger.kernel.org
References: <20180117151629.27423-1-robdclark@gmail.com>
From:   Thomas Hellstrom <thellstrom@vmware.com>
Message-ID: <1706f2da-1349-4461-3a16-7287dbf12958@vmware.com>
Date:   Wed, 17 Jan 2018 16:31:44 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101
 Thunderbird/52.5.0
MIME-Version: 1.0
In-Reply-To: <20180117151629.27423-1-robdclark@gmail.com>
Content-Type: text/plain; charset=utf-8; format=flowed
Content-Transfer-Encoding: 7bit
Content-Language: en-US
Received-SPF: None (protection.outlook.com: vmware.com does not designate
 permitted sender hosts)
SpamDiagnosticOutput: 1:99
SpamDiagnosticMetadata: NSPM
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2018 15:31:56.2688 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: dfb82f04-337f-4a3c-6ca7-08d55dbf7287
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: b39138ca-3cee-4b4a-a4d6-cd83d9dd62f0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR05MB757
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

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,
>   };