From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E7CA5C43613 for ; Thu, 20 Jun 2019 18:30:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C36DD20665 for ; Thu, 20 Jun 2019 18:30:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561055449; bh=bj2kUGnKEXDmE1Cppoi9JZnBNIW05KPvfpjE5tpGM6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=H2mmwyGo4+cyXPS05dSKIoF5rFs4sSpgbcledjhPJa+EZFhv1WMjOuEi2x3U1m27X MiJj4XExwnIN4bLepumk+jOKlsuhWbCezANrEjCYQ6tsgS1itsorH1c9fZWmRKyTp3 Y9I2amwvfrKjUNp7KDXiK0K+h+uB1u9Qly1nHpKE= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726983AbfFTSAe (ORCPT ); Thu, 20 Jun 2019 14:00:34 -0400 Received: from mail.kernel.org ([198.145.29.99]:49436 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726297AbfFTSAd (ORCPT ); Thu, 20 Jun 2019 14:00:33 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 9A3B8214AF; Thu, 20 Jun 2019 18:00:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1561053633; bh=bj2kUGnKEXDmE1Cppoi9JZnBNIW05KPvfpjE5tpGM6M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uSZATxviBsc6FFecmZCHvcmpuUU1j9iZ53OXbMZxRH1GcHn7J7PynkwBEh+dJzigL NswNZSlus0V0fULeGtPyojgugsK9bnf9uhUl7J3dNRuhfKIDXvWYTcyFuH/PWjFErS FLV36mjomd16Qq+vvwcv3wmDWbrK3QLBDg2cZ6T4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Murray McAllister , Thomas Hellstrom Subject: [PATCH 4.4 57/84] drm/vmwgfx: NULL pointer dereference from vmw_cmd_dx_view_define() Date: Thu, 20 Jun 2019 19:56:54 +0200 Message-Id: <20190620174347.583501446@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190620174337.538228162@linuxfoundation.org> References: <20190620174337.538228162@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Murray McAllister commit bcd6aa7b6cbfd6f985f606c6f76046d782905820 upstream. If SVGA_3D_CMD_DX_DEFINE_RENDERTARGET_VIEW is called with a surface ID of SVGA3D_INVALID_ID, the srf struct will remain NULL after vmw_cmd_res_check(), leading to a null pointer dereference in vmw_view_add(). Cc: Fixes: d80efd5cb3de ("drm/vmwgfx: Initial DX support") Signed-off-by: Murray McAllister Reviewed-by: Thomas Hellstrom Signed-off-by: Thomas Hellstrom Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -2682,6 +2682,10 @@ static int vmw_cmd_dx_view_define(struct if (view_type == vmw_view_max) return -EINVAL; cmd = container_of(header, typeof(*cmd), header); + if (unlikely(cmd->sid == SVGA3D_INVALID_ID)) { + DRM_ERROR("Invalid surface id.\n"); + return -EINVAL; + } ret = vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface, user_surface_converter, &cmd->sid, &srf_node);