From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f54.google.com (mail-wm1-f54.google.com [209.85.128.54]) (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 8752E39A7F6 for ; Sun, 12 Jul 2026 12:37:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783859855; cv=none; b=gCOkAbZr9dVBNZ2a1BSGNnSylEK0IP4/dROq2MjzISQJwFCpsKKfqwu/vvgzD+CljHQPFibCEEWZJIz3Rxr0K+jPgjcQF+bqW0r6nyR5efyz6a9/BaboKWOC7oOxbv1Gyvb9Yc3bjZbX3e9RhQ6oC/YiYxjjzOT/RgXDElXUDnk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783859855; c=relaxed/simple; bh=DyNZBgCN8atzNahh4j0zXns3XiMLFiYaiTFqRn4ZA6o=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wh6fu4iDhBGf7Hq2vZj74EVgT7+g+Yqk5KJWlUNMH42GrEjy+E7vI85c1Ffv4pm/lz0OIhDGPDg0qrk9tT75X+3gwCemiaNN37k+BelbacBOXPhR/pKg+Pog2RMUsWvJ7VncbGy13Sh8LxaY9WdMVWfMbrbl1JfEh2czJeLKHNg= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lGzEozEA; arc=none smtp.client-ip=209.85.128.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lGzEozEA" Received: by mail-wm1-f54.google.com with SMTP id 5b1f17b1804b1-493f60208a5so17976365e9.3 for ; Sun, 12 Jul 2026 05:37:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783859852; x=1784464652; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=x7IitsXdpTEQRJSq8p+rIrB3s36tgZetIRvXFPP7irs=; b=lGzEozEAv8uPseFkbCFby77c80Cf5MrnEjoJJuTEKeNO/pMokSi5dXVaQsF7ex6KCH RtFu4ezrfGTRfKIZtEiAyBCnchoD0IkZ1BiKeSaCl05aOQgIhmMgfTFRCFVSyXCC/hTH 1bLAMYOwdTgdk2C6FdGQTWERUogJL3sp69887QYfV1Np2jWzWyU+2EvfmgcqIiM9NK+q tbDgJw7VSBG/qhVnSUC+K9R/yuLJkymsOe6ZnQmQ2uk/W8nH2wDu4DSaNb62SJAD+2y4 wgZEClyD5kpB/z/2TSzxJbfn8CYU/rhvNKEjUYQ7norECIXTdCAJJ+CVSiwAagUMLpp3 eF1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783859852; x=1784464652; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=x7IitsXdpTEQRJSq8p+rIrB3s36tgZetIRvXFPP7irs=; b=PD4uVqmb+UlZygJmKyzQNbJuFipLKOQzRfCgTLKh+kOBHUPlOO1nkl/heEU5D8nrVO lyeq+KXK8tXM4tX8cB6srqP7raUbcD46t31TyuUNnWuxL2LEyukfKAEpeaNfEFK492C9 a4E0pYeMnsyHPMLtQyWdBVExVvtw6yeJ+WJT6izSSIRJng+/Y+Ah7L3EX8FEaBKXkNKc 6M0h0OSSNMicf30nzkPPM205RLO1OQBwX+0s808rRTSW6oDMol+bhRrDJeuNWgHAJ4eq 3dJi03552hirlRLePcauQz5p2jfhhuHU1fMiPQAHREDQz3eOVcL0cj/tQM7S2XaIWcMl WkLg== X-Forwarded-Encrypted: i=1; AHgh+Rpx2lROHwS0NV99RZj/TeV8gIkJCKdtsk8VIlnDegpIAPlJV8hOckpy2ysuuHvzunOQExZjDm5HT4nYcpM=@vger.kernel.org X-Gm-Message-State: AOJu0YwCkTKnvlft0/E3AKyt1R6OtxXR9pldQUEjkNVkAYxCFT7SOowc HQE/JPcEO6jaSkggKZKqIHNy8brQUnf7Doj4hZXqeEUDUiDy4BgINwyg X-Gm-Gg: AfdE7clv3X8hajqerEj1Z8EcUziIfLITANlmj820ctJFyb5HQko0A6XcUqtPYLfA6sN QeC9tJ2khziduEuHLbCb8bRuOMjmu4J0ZM+g91JNj8akBK1+XiWfhhQQy4fXq/sGvV9Kkf91I4Q kh6v9AsMSj/YoEu6novNiGevklajwbqbPIoGpdukyL+xVco9qzSpjyfgu5Er85rfeCWUPzWsjaz czXUiDPVETrD16MK5185YenjzCCxKKeyGx5WRt4N0VZYojSiCBiWD5xjVKo5l2h5o+4WTJBuUQe affY7iMiaMqwyUs8QcYLpPRPeS12F507bMhr4rwHOD5eMCqQxai+p1CHyIh4zGtEQQy5NaS0Ajv gVZ54vyAv0WrBRCvS0oPu+mTtRdhG/L4HcXf5D1qHHTnBLQbKUAKcg9lmhkYKaluNCgm6euEEja KTtjgWe3ENjfrYvu4= X-Received: by 2002:a05:600c:1386:b0:490:5057:f5f7 with SMTP id 5b1f17b1804b1-493f87e5164mr54882405e9.11.1783859851424; Sun, 12 Jul 2026 05:37:31 -0700 (PDT) Received: from fra-x8664 ([2a01:e11:8000:43b0:96d6:566b:35c:7b8c]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-493eb6f3c42sm280280485e9.1.2026.07.12.05.37.30 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 05:37:30 -0700 (PDT) From: Francesco Magazzu To: Lyude Paul , Danilo Krummrich Cc: dri-devel@lists.freedesktop.org, nouveau@lists.freedesktop.org, linux-kernel@vger.kernel.org, Dan Carpenter , Karol Herbst Subject: [PATCH v2 1/4] drm/nouveau/clk: fix list cursor use after loop in nvkm_clk_ustate_update Date: Sun, 12 Jul 2026 14:36:13 +0200 Message-ID: <20260712123616.1180830-2-postadelmaga@gmail.com> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260712123616.1180830-1-postadelmaga@gmail.com> References: <20260712123616.1180830-1-postadelmaga@gmail.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit If the requested pstate id is not present in the state list (or the list is empty, e.g. broken/missing perf tables), the list_for_each_entry cursor runs off the end of the list and the subsequent pstate->pstate != req check dereferences the list head cast to a struct nvkm_pstate, which is an out-of-bounds read. Track whether the entry was actually found instead of inspecting the cursor after the loop. Fixes: 7c8565220697 ("drm/nouveau/clk: implement power state and engine clock control in core") Signed-off-by: Francesco Magazzu --- Note: essentially the same fix was posted by Dan Carpenter in 2022 and never picked up; the bug is still present in drm-misc-next. Credit for spotting it goes to him. Link: https://lore.kernel.org/dri-devel/YvSkKAdk8Pe0g2K9@kili/ drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c index 572e63846..42f3709e0 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c @@ -479,13 +479,17 @@ nvkm_clk_ustate_update(struct nvkm_clk *clk, int req) return -ENOSYS; if (req != -1 && req != -2) { + bool found = false; + list_for_each_entry(pstate, &clk->states, head) { - if (pstate->pstate == req) + if (pstate->pstate == req) { + found = true; break; + } i++; } - if (pstate->pstate != req) + if (!found) return -EINVAL; req = i; } -- 2.55.0