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 DB0F81598E3; Tue, 9 Jul 2024 11:15:21 +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=1720523721; cv=none; b=cv8hpQ9MM8PgOcuq3/+675ydtNOK5BmWkZEfbpea3Peooi+Yh3QWDht9G4+CwrwZMAUCnKzszKcB/6uMxHaVus6h0hBlOqMwpkacsfQFZAWMG/jiriVBPM5egUPwM+0dIlkQKQk1f241ox1EOt+7iCtYQTUzkpZZCe66HdXvPoE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1720523721; c=relaxed/simple; bh=eEKFQZPM7PkUOkZOJVyZvvCatpVWsx3+KCfLCwOFkj0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=qq/WfvMBMLzKZTGz5CVlA06FID9tJHonK1K3zMcbtDQL7pszBpvZD2UE1+/adzlWAu+jpYeq0Qhzvgwn1joqAjpJ1A67PuS/YRnPOBE3EvmMCKVeUI2W0lR3x97te0fHV/lC2JuoNwXPAF7hkkNLeNE8yD4OCRpRlGnSdHg7Sjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rX/B1VVE; 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="rX/B1VVE" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6167DC3277B; Tue, 9 Jul 2024 11:15:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1720523721; bh=eEKFQZPM7PkUOkZOJVyZvvCatpVWsx3+KCfLCwOFkj0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rX/B1VVE2n+EyDohCsxfhzDH5NZPnyG70uAjC2rr6D0dJLobdm25VWYRpLqGgNZcd FchgKsfEs9lpO/ZHEhlzeNJIIC3rUL6NbnEkYrMdCdauJDm6Nk9kTS9ohGEAuugKLV aq0krs92Mf630E3zYL34WgULRZ5q3k348fSSF+F8= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Greg Kurz , =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Michael Ellerman , Sasha Levin Subject: [PATCH 6.6 045/139] powerpc/xmon: Check cpu id in commands "c#", "dp#" and "dx#" Date: Tue, 9 Jul 2024 13:09:05 +0200 Message-ID: <20240709110659.908836702@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240709110658.146853929@linuxfoundation.org> References: <20240709110658.146853929@linuxfoundation.org> User-Agent: quilt/0.67 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Greg Kurz [ Upstream commit 8873aab8646194a4446117bb617cc71bddda2dee ] All these commands end up peeking into the PACA using the user originated cpu id as an index. Check the cpu id is valid in order to prevent xmon to crash. Instead of printing an error, this follows the same behavior as the "lp s #" command : ignore the buggy cpu id parameter and fall back to the #-less version of the command. Signed-off-by: Greg Kurz Reviewed-by: Cédric Le Goater Signed-off-by: Michael Ellerman Link: https://msgid.link/161531347060.252863.10490063933688958044.stgit@bahia.lan Signed-off-by: Sasha Levin --- arch/powerpc/xmon/xmon.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/xmon/xmon.c b/arch/powerpc/xmon/xmon.c index b3b94cd377137..1d815405a3b4f 100644 --- a/arch/powerpc/xmon/xmon.c +++ b/arch/powerpc/xmon/xmon.c @@ -1352,7 +1352,7 @@ static int cpu_cmd(void) } termch = cpu; - if (!scanhex(&cpu)) { + if (!scanhex(&cpu) || cpu >= num_possible_cpus()) { /* print cpus waiting or in xmon */ printf("cpus stopped:"); last_cpu = first_cpu = NR_CPUS; @@ -2774,7 +2774,7 @@ static void dump_pacas(void) termch = c; /* Put c back, it wasn't 'a' */ - if (scanhex(&num)) + if (scanhex(&num) && num < num_possible_cpus()) dump_one_paca(num); else dump_one_paca(xmon_owner); @@ -2847,7 +2847,7 @@ static void dump_xives(void) termch = c; /* Put c back, it wasn't 'a' */ - if (scanhex(&num)) + if (scanhex(&num) && num < num_possible_cpus()) dump_one_xive(num); else dump_one_xive(xmon_owner); -- 2.43.0