From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1645D4218BB; Wed, 4 Feb 2026 15:06:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217603; cv=none; b=GxBsnF9OmFaRZLPR8+okzjq7sQQDnZ2ni51QDI1goflzpRAWS0qGvbwiqtGwU9ojeyhHefy76YPV/jtGU0jsYSl3asWUe1/bgcnLewIoEBYeB3n78tjNqyDrg9GSJs+PJI5Q+KlPkgxKExOgb+M68mv51AeUS2zSgW+Mho8XdhY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770217603; c=relaxed/simple; bh=+6d1Fat8iHbsXvSuycUno+HXI3FKqWlujUBMKc6K/3A=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDVPJvtoCZ+b9AHl0KUXJqJ84L5EFQ80SMD4eGEI/edo4HokVArdXoBduKaTkj+4ZRisCXSq2uglnW40dbufNwC+WHURHYgeqPW5ZB/4btxYt7ZByKxgsgc7y/54pPVR74+1XQDo1Fd/KJu3pkbrTPyJqw/KG2ayhGlAUguPH3o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=LmGCPgSb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="LmGCPgSb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3453BC4CEF7; Wed, 4 Feb 2026 15:06:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1770217603; bh=+6d1Fat8iHbsXvSuycUno+HXI3FKqWlujUBMKc6K/3A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=LmGCPgSb1aPP1aO0WR7rX1gxvrasDEaqzTSJi39EH6vZZX2Rj64tL2X23LjeYzji6 VMjBwsy8hzdgMShhiEn3Dj1ruS+bhdNwpAbsXPjAltGvdE28zbeZ0OlecifouW47HQ fOMIJpgteZhj5Gaiv0AIhf+ovjBeqpCM7zYWLMfs= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Haoxiang Li , Zack Rusin Subject: [PATCH 6.1 065/280] drm/vmwgfx: Fix an error return check in vmw_compat_shader_add() Date: Wed, 4 Feb 2026 15:37:19 +0100 Message-ID: <20260204143911.995055969@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260204143909.614719725@linuxfoundation.org> References: <20260204143909.614719725@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Haoxiang Li commit bf72b4b7bb7dbb643d204fa41e7463894a95999f upstream. In vmw_compat_shader_add(), the return value check of vmw_shader_alloc() is not proper. Modify the check for the return pointer 'res'. Found by code review and compiled on ubuntu 20.04. Fixes: 18e4a4669c50 ("drm/vmwgfx: Fix compat shader namespace") Cc: stable@vger.kernel.org Signed-off-by: Haoxiang Li Signed-off-by: Zack Rusin Link: https://patch.msgid.link/20251224091105.1569464-1-lihaoxiang@isrc.iscas.ac.cn Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_shader.c @@ -917,8 +917,10 @@ int vmw_compat_shader_add(struct vmw_pri ttm_bo_unreserve(&buf->base); res = vmw_shader_alloc(dev_priv, buf, size, 0, shader_type); - if (unlikely(ret != 0)) + if (IS_ERR(res)) { + ret = PTR_ERR(res); goto no_reserve; + } ret = vmw_cmdbuf_res_add(man, vmw_cmdbuf_res_shader, vmw_shader_key(user_key, shader_type),