From nobody Sun Feb 8 04:34:11 2026 Received: from mail-ua1-f100.google.com (mail-ua1-f100.google.com [209.85.222.100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 457F82F2910 for ; Wed, 24 Dec 2025 08:57:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.222.100 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766566631; cv=none; b=c7K+eP9PADV2GL3d4fToxVqJLl4oKa4v0BFgiazIZS1i5TmdSl24fNbYT1IyVtL38OgCnkWWeXO0W0WjFdaE9/iJR0pz6lwFd66D1EybL3eHQpXXKFFAFhEq+fgUTThvqfyH7elVlG4V90UBdC3HXtGXaHQtCQ+U29aobQIzGmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1766566631; c=relaxed/simple; bh=eBjQ0IUA9s919dbAoDwhWCvJJuKBm8IKcD5ysjybSgI=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=ez4dun2cx5+dST6h4xuJUnf01NrpkKtgTPqjLz66/p0+vMY2bUP/6EUnBFgYO43j7v+tFsczPSl8sA0Mzkq+lgmn6Nf5khcdUiaZdYGK70SlLaC58uB+Y1pao5VDJLjpUutdesByndN8DARktR/NK3pLxj4eHEbM6tUHnivU19g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=N3XSXeci; arc=none smtp.client-ip=209.85.222.100 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="N3XSXeci" Received: by mail-ua1-f100.google.com with SMTP id a1e0cc1a2514c-93f56804894so3531691241.3 for ; Wed, 24 Dec 2025 00:57:07 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1766566627; x=1767171427; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dkim-signature:x-gm-gg:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=VerAfBullZiHp/WWvzSGqbTxnUFTnHi0CQ8Rn/jBT1o=; b=bzbSGg5/qS/IwTzlhKZH1I8sV7A8BbcoZLDey3i1qoE/HELcnxHcrkUdACQ8/dFd6R vVsnt9KjH0cwrrISAsnc8a95CFliDTwMJAVQRxYQxBzs1EuUEusssA6aazApqhseCTfj 7SCPjMtCsEEFfo3qWp17soyopeP0itwgc/SnK76kQAzrtWBoDtW+GoFvQGMn/Slo9xNu T+IofmMHQZVmU/4Rkw6mYeLLCKu4bQKAXUyKizzXCt2QoJL16ZFsKXCs3TO3ywumZYAJ AWqT75VR74K1VrSQW/+RXlonFcFpkYqz57LFGkUuooQGJNf9iSV5gvP8tIpAWIhfqEhz ehqA== X-Forwarded-Encrypted: i=1; AJvYcCVHOfPu7jBpeKbfbU5C5+PaMeVbVgRI3p33BfeEGuSNcb/1Fe0YfPmg1l2Iya/7XIJLFkWbD2fD+WN3wKI=@vger.kernel.org X-Gm-Message-State: AOJu0YzWIDrL5nGe37W0z2Dv9pbD00VBIQudble5Pj6W21v7XYS0Kegz 8nQ+H7PtD9LUUzzWzg/UKqsr8CHzyICjqHKRjYkRaM5s5YeY0M7gItj9OliJjNn+RCDGAKrijzt JeI5pktqIwnaGpyjgx0IPtH/Jo/jSjHKW909NESmVfyxPX6fedKYOZh7vWt7229BL0OXFQln6Yz ELbxzJczRGJWnEFxVW2oMei+5EJT71HvVu/Kkj6OGXCKMMHDehwUHyJWvt2FwMMdJClPec9UFj6 K5gOZo3+49IcmmAcEHSspM+JA== X-Gm-Gg: AY/fxX7XV1N38D9el9XlaU1MNElirsPtrGw8aeE0024T5o93zm3L/j8uD2ehllC43uE b9SMBBpq26tg2BQRBOHs7NPXJzmNoIRGydnZGfvJvxywXtP18r5PmVJv56zvEmRHQ+OrET7yIyh 2QWB+Bu2QTC0GNiA8jxZ/cz2aXtomyrOhnG766h8SkXStWIpaXb4TizsuR4FY0MdfQqURucUNaf 4Pk9JtfAjW0o8FKfnJzfgeQRDSNn6MnknfmHOFC1VzxWoBi85e8qAnNfifJ1IEoIcxZ1mshHYZ6 o2IMgGZEM3R28IFv55GfLYe6OOCjRVXrjmx+YjBXPn8DI8GZAWXvVlc/YTtGEWt8UR081AxoWE0 Pb1vzeUVM0sIDrhmBfiFmu3+VeKbGPY0IhJ/qzml0uZ3iVE0fOCDzigrwPRYBHNx+usYjODF3e7 uRpDuVu58ANwPUKMWHeu4yF5KrVkcXHxXg6i+Br+Hs1wXD4g== X-Google-Smtp-Source: AGHT+IFKesieeYqE0CJN+I8gnRSpRWsviMFQQmcIgx+cQOKJVQmUE4XfPhglSSqczah9iyJnuBbkdzSGsTlc X-Received: by 2002:a05:6102:5e97:b0:5df:af0f:3094 with SMTP id ada2fe7eead31-5eb1a85f50bmr5710788137.42.1766566626861; Wed, 24 Dec 2025 00:57:06 -0800 (PST) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-2.dlp.protect.broadcom.com. [144.49.247.2]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-5eb1ac12148sm2311804137.3.2025.12.24.00.57.06 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Dec 2025 00:57:06 -0800 (PST) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-pg1-f199.google.com with SMTP id 41be03b00d2f7-b6ce1b57b9cso5736020a12.1 for ; Wed, 24 Dec 2025 00:57:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1766566625; x=1767171425; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=VerAfBullZiHp/WWvzSGqbTxnUFTnHi0CQ8Rn/jBT1o=; b=N3XSXecihR7J9ScQSHqF45ZWrwq+8ftAYHBD2g4tfugScamxdBI92I8DPG6isq2PwI bg1qGkh6qHAMQ/K4bk1ISdnwLfpMUwxoq7lNdDiQVo8qxW3LNAPr94x6I7QBc+4thP11 h7kZCwJ4oa0drOow11Axm5vWgN9Wbb+1c1qSU= X-Forwarded-Encrypted: i=1; AJvYcCVXApjIFHCPdgXjDbrhWpOnpSyGfJZYqSNtpqpcEmvRnyEHj0/kfIWAtm/fPK9TP/iitrok0HsXVx2c1P8=@vger.kernel.org X-Received: by 2002:a05:693c:809a:b0:2b0:5609:a593 with SMTP id 5a478bee46e88-2b05ebd0cd4mr16134860eec.16.1766566624964; Wed, 24 Dec 2025 00:57:04 -0800 (PST) X-Received: by 2002:a05:693c:809a:b0:2b0:5609:a593 with SMTP id 5a478bee46e88-2b05ebd0cd4mr16134846eec.16.1766566624413; Wed, 24 Dec 2025 00:57:04 -0800 (PST) Received: from shivania.lvn.broadcom.net ([192.19.161.250]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2b06a046e99sm43516490eec.6.2025.12.24.00.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 24 Dec 2025 00:57:04 -0800 (PST) From: Shivani Agarwal To: stable@vger.kernel.org, gregkh@linuxfoundation.org Cc: zack.rusin@broadcom.com, bcm-kernel-feedback-list@broadcom.com, maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, simona@ffwll.ch, airlied@gmail.com, brianp@vmware.com, dtor@vmware.com, airlied@redhat.com, thellstrom@vmware.com, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, ajay.kaher@broadcom.com, alexey.makhalov@broadcom.com, vamsi-krishna.brahmajosyula@broadcom.com, yin.ding@broadcom.com, tapas.kundu@broadcom.com, Kuzey Arda Bulut , Ian Forbes , Sasha Levin , Shivani Agarwal Subject: [PATCH v5.10-v6.1] drm/vmwgfx: Fix a null-ptr access in the cursor snooper Date: Wed, 24 Dec 2025 00:36:52 -0800 Message-Id: <20251224083652.614902-1-shivani.agarwal@broadcom.com> X-Mailer: git-send-email 2.25.1 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e Content-Type: text/plain; charset="utf-8" From: Zack Rusin [ Upstream commit 5ac2c0279053a2c5265d46903432fb26ae2d0da2 ] Check that the resource which is converted to a surface exists before trying to use the cursor snooper on it. vmw_cmd_res_check allows explicit invalid (SVGA3D_INVALID_ID) identifiers because some svga commands accept SVGA3D_INVALID_ID to mean "no surface", unfortunately functions that accept the actual surfaces as objects might (and in case of the cursor snooper, do not) be able to handle null objects. Make sure that we validate not only the identifier (via the vmw_cmd_res_check) but also check that the actual resource exists before trying to do something with it. Fixes unchecked null-ptr reference in the snooping code. Signed-off-by: Zack Rusin Fixes: c0951b797e7d ("drm/vmwgfx: Refactor resource management") Reported-by: Kuzey Arda Bulut Cc: Broadcom internal kernel review list Cc: dri-devel@lists.freedesktop.org Reviewed-by: Ian Forbes Link: https://lore.kernel.org/r/20250917153655.1968583-1-zack.rusin@broadco= m.com Signed-off-by: Sasha Levin [Shivani: Modified to apply on v5.10.y-v6.1.y] Signed-off-by: Shivani Agarwal --- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c b/drivers/gpu/drm/vmwg= fx/vmwgfx_execbuf.c index 0d12d6af6..5d3827b5d 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c @@ -1507,6 +1507,7 @@ static int vmw_cmd_dma(struct vmw_private *dev_priv, SVGA3dCmdHeader *header) { struct vmw_buffer_object *vmw_bo =3D NULL; + struct vmw_resource *res; struct vmw_surface *srf =3D NULL; VMW_DECLARE_CMD_VAR(*cmd, SVGA3dCmdSurfaceDMA); int ret; @@ -1542,18 +1543,24 @@ static int vmw_cmd_dma(struct vmw_private *dev_priv, =20 dirty =3D (cmd->body.transfer =3D=3D SVGA3D_WRITE_HOST_VRAM) ? VMW_RES_DIRTY_SET : 0; - ret =3D vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface, - dirty, user_surface_converter, - &cmd->body.host.sid, NULL); + ret =3D vmw_cmd_res_check(dev_priv, sw_context, vmw_res_surface, dirty, + user_surface_converter, &cmd->body.host.sid, + NULL); if (unlikely(ret !=3D 0)) { if (unlikely(ret !=3D -ERESTARTSYS)) VMW_DEBUG_USER("could not find surface for DMA.\n"); return ret; } =20 - srf =3D vmw_res_to_srf(sw_context->res_cache[vmw_res_surface].res); + res =3D sw_context->res_cache[vmw_res_surface].res; + if (!res) { + VMW_DEBUG_USER("Invalid DMA surface.\n"); + return -EINVAL; + } =20 - vmw_kms_cursor_snoop(srf, sw_context->fp->tfile, &vmw_bo->base, header); + srf =3D vmw_res_to_srf(res); + vmw_kms_cursor_snoop(srf, sw_context->fp->tfile, &vmw_bo->base, + header); =20 return 0; } --=20 2.40.4