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 D2E563624B0; Wed, 8 Apr 2026 18:32:53 +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=1775673173; cv=none; b=BcjGrC5u9lukQz3wNwl2dO9bkyqnJaW7pesDwHfffpracFZk8BRLSeneqbQ72M0hsBe+URCSD7HSU2xpU/PGHfos73Zu94I3cAhGXb3lW5CY5mQ7gwP/irgyhZodYJKlbT4vGvAWQuwRaMVRCagROK3993xfc37A/H/2krug+hY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1775673173; c=relaxed/simple; bh=1rqxBKbtsGxMp62K+S44MXraGX71PDsL6I9rLy4G78I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=eDlhZC6w2izIuVbCDbpeUYQicJodySHxJgRO4esYz2/sNUXupousXIIhjPOqLJsB3XIJ54E5DGLUN+svepV5NyiyU1Re0mvqfklFUvjmrqtbxADtlAouVPy87Fr6I3KJUEbTs2x/cSBXjeQGsjE/eTjtH33YncaB4D+JWiGyo0o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=XEZNTeNp; 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="XEZNTeNp" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D352C19425; Wed, 8 Apr 2026 18:32:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1775673173; bh=1rqxBKbtsGxMp62K+S44MXraGX71PDsL6I9rLy4G78I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=XEZNTeNpO8r3b8BnCfEo3+C++FQpQ5cQzlBdRic243FcB3OeBWmhkyw8eh+MSmfke gVIxYdneFEmnMeysfIygO4YrYEkJtkZPtGKiU7gqRltIBXOTvb/8Z0Dm3zEkl1ASbx EfEsq7e9w0PTMwC5YK4LUzvgDB2sLS0OvxUGyeAU= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , stable Subject: [PATCH 6.18 129/277] drm/ioc32: stop speculation on the drm_compat_ioctl path Date: Wed, 8 Apr 2026 20:01:54 +0200 Message-ID: <20260408175938.692348442@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260408175933.836769063@linuxfoundation.org> References: <20260408175933.836769063@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.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kroah-Hartman commit f8995c2df519f382525ca4bc90553ad2ec611067 upstream. The drm compat ioctl path takes a user controlled pointer, and then dereferences it into a table of function pointers, the signature method of spectre problems. Fix this up by calling array_index_nospec() on the index to the function pointer list. Fixes: 505b5240329b ("drm/ioctl: Fix Spectre v1 vulnerabilities") Cc: Maarten Lankhorst Cc: Maxime Ripard Cc: Thomas Zimmermann Cc: David Airlie Cc: Simona Vetter Cc: stable Assisted-by: gkh_clanker_2000 Signed-off-by: Greg Kroah-Hartman Acked-by: Thomas Zimmermann Acked-by: Maxime Ripard Reviewed-by: Simona Vetter Signed-off-by: Thomas Zimmermann Link: https://patch.msgid.link/2026032451-playing-rummage-8fa2@gregkh Signed-off-by: Greg Kroah-Hartman --- drivers/gpu/drm/drm_ioc32.c | 2 ++ 1 file changed, 2 insertions(+) --- a/drivers/gpu/drm/drm_ioc32.c +++ b/drivers/gpu/drm/drm_ioc32.c @@ -28,6 +28,7 @@ * IN THE SOFTWARE. */ #include +#include #include #include @@ -374,6 +375,7 @@ long drm_compat_ioctl(struct file *filp, if (nr >= ARRAY_SIZE(drm_compat_ioctls)) return drm_ioctl(filp, cmd, arg); + nr = array_index_nospec(nr, ARRAY_SIZE(drm_compat_ioctls)); fn = drm_compat_ioctls[nr].fn; if (!fn) return drm_ioctl(filp, cmd, arg);