From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) (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 9084B3A6B85 for ; Sun, 12 Jul 2026 12:37:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.46 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783859859; cv=none; b=R4fD1JndAU3qWwyZhqZbDLKbldD8vdJ/3ZB38VHUba8bblNFMY8L1pj3iPds7oaSpHGSIxaixHp+gLTZOGwRUeWILXqANIxjjzsdWdGrHX2lvrMTrIIMAmcWVmbF7YxDVNxqnopMxJ0SAZC6Sa9D9w/5V8SfL0XxI0A05oZ5zOg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1783859859; c=relaxed/simple; bh=QeVuH9IkYEhWdGIAVRSEeO/O8I/8BFvs9tAfRoRFQvs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fFLGVPYBv/dyFPDC7qIXRcZgGnZ4VxnCZkJZ7YP6lWpD0k0yhIL6SG/XpfLokGV+MYLP22b1qw4OaEtZ5En32x4iMJKUiAarn865r9wc2RRx4FPeNHsAoPLXehEOoj8cCliTKng7Mz6q5W+7dXhq4nzf7kXWMXS4XgBWOYy0ZN4= 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=tIut/2yO; arc=none smtp.client-ip=209.85.128.46 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="tIut/2yO" Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-493b77b150aso19816885e9.2 for ; Sun, 12 Jul 2026 05:37:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1783859856; x=1784464656; 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=yZa2enwSIIgLldRkiC8kJq5D8PtsumlenYqYmwQU3wk=; b=tIut/2yOmUoN9ZV5Np57+9ZqbR3YE0RzB/++lfOHMdI2+bUYM2PchgmOFDCZVimW+x pfDZaoL6qXhC+gNRq3iz8u0rZvq4UBazx4p0j5ArcUeZHmk13Rb4eIQnngQLuXFY6iFe qwXlMhZ8QwGoPvdHtO4j/wBMIFuojLoO/m53aR6if8dJyIfbgpvXaZGKfc2eGoQAIsKn mX5gNNTJ5LVTJLhAjull9l4qY5OJVubSADNhZxAIPtQcxAoZqgii9lGQhKOeXkHA3cp8 k2drTN6fzxAbdUhY9V/fzrr1kz+bOYviRnBTdsOMQ/244CBKem8iwIxynpYtdwOlXUcr 1VOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1783859856; x=1784464656; 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=yZa2enwSIIgLldRkiC8kJq5D8PtsumlenYqYmwQU3wk=; b=TB0UfZlxbz6btihBIjlF4lL9l0v7WUoL+s4J+uhSR2c6KspL2oUUo563fxt/pqFqGW puNiTzj+YqpQ8QQJ3lyecv86nAkrF8VA/wfWdOJ4rzT6I7xI8ouGP9QbKn+k8kTO3Rp3 voAsgdSEO1LtIIRtnUAqfV0mamVtxmEbNA45X0P++ATcK+z6LJ86zgBYROQqpN+zgkIi V0koOe0y4OahKVsxTScBaZYWMA65NBgRKk1/OvqBr3u3xxdgZsbmsyxVI09Vo4ymH/ji ZLXFtplxC75vN6kl5xdjSKDj0hlHm79OD0fqezC4cVp40EMVuae4++n4HcGZTedBei1L GZGA== X-Forwarded-Encrypted: i=1; AHgh+RoTnpDF1kQqirqmb0ZnMkwSnj5gtUkABHdPlGfVipCvbyQ/xMCUrX54F6uN/E9FpVBKfNSrKsfNeIPTQ6Q=@vger.kernel.org X-Gm-Message-State: AOJu0YyKIrN9jrCB0wZwWP06+WPewEGDqNF76j9UWg1iTXwYfbG47yAx SeFNH6O8OfLaQOvuED9jUDylW872XlxGSNoHzbBEmxbTN+eXgpBFvsJF X-Gm-Gg: AfdE7ckQo+Dqj8HFC7WU2ciyhvYRLimHTPNWc7qX/G9bPG9xPbC7m5bcupi0XUcNp7X KLS1NGKwvtLjVYj01WHhRtNpkxzy1nX9P4ouo4TjWPtcfW80cZRvAzr58Zficfdjt0/9VHcfymj FOnT7BtwmxMo2ZvsHXs/w4aldY3X8GZ293Zqsf8Wvj4yS7U1fkiJUXSxCr/nUU7kVuwckPWMRsC FmcjcaUUPplaK2of5s1hhZgf5VLFcDUlWGaatbqAltd9N4kJwPIUTXETTew9dajNxLFn5W2dMP4 469TnFZFnuxg7ya5TkhGWaBd9JPDIWy0ryjxqqsUIrsNc2dMq8tqoDsqfOUuhyCxoySP1uN6ko5 AkRnM44cOzV/KEwvRCcqBlbvqVMDYx0dEz6LWGDfsJEYlyXiNs8UhBSC+WIYZs0bBO5Aw4K06We 9Iuw7wAH3U9peM5Xo= X-Received: by 2002:a05:600c:80c5:b0:493:a570:df7d with SMTP id 5b1f17b1804b1-493f881d20fmr37660025e9.20.1783859855726; Sun, 12 Jul 2026 05:37:35 -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.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 12 Jul 2026 05:37:35 -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 2/4] drm/nouveau/clk: don't use the pstate cursor after the loop Date: Sun, 12 Jul 2026 14:36:14 +0200 Message-ID: <20260712123616.1180830-3-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 nvkm_pstate_prog() walks clk->states looking for the entry at index 'pstatei' and then keeps using the list_for_each_entry cursor after the loop. This is not triggerable today: every caller clamps the index against clk->state_nr before calling, so the loop always breaks on a real entry. It is safe by virtue of what the callers happen to do, not by anything the function itself checks. Should a caller ever pass an index that is not on the list, the cursor would point at the list head rather than at a pstate, and the pstate->base.domain[] and pstate->fanspeed accesses that follow would read past it. Rather than leave that trap in place for the next caller, track whether the entry was found and return -EINVAL if it was not. No functional change. Signed-off-by: Francesco Magazzu --- drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c index 42f3709e0..4d546b07f 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c @@ -270,13 +270,19 @@ nvkm_pstate_prog(struct nvkm_clk *clk, int pstatei) struct nvkm_fb *fb = subdev->device->fb; struct nvkm_pci *pci = subdev->device->pci; struct nvkm_pstate *pstate; + bool found = false; int ret, idx = 0; list_for_each_entry(pstate, &clk->states, head) { - if (idx++ == pstatei) + if (idx++ == pstatei) { + found = true; break; + } } + if (!found) + return -EINVAL; + nvkm_debug(subdev, "setting performance state %d\n", pstatei); clk->pstate = pstatei; -- 2.55.0