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 B1BB134DCE0; Tue, 26 Aug 2025 13:20:24 +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=1756214424; cv=none; b=p+KgK+JocvO9ZE2pK+d78NQ/WR7p60yHfeXv2APDeLzJ/lelHpmMux5PKf4L8MDGJ8yfjqhhv48lHqzrcW0k3NRJ8bn+f5SWFbG0biCkMP06kgQeQwbFsZW0gBCs1Qggi17NEkBbAsxh89nKhCAYkhlFruw56Bv643/aC56etnc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1756214424; c=relaxed/simple; bh=1hZUlWBCN7Mw5Tud1DRZI1GlZjc2xdBKHisv5jOU1R0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=E7U59bLsArZrNl/833oI/Y39eaztRiptw/pJiqGlg5y0ZBylvtpEoi0/oPMLfng766hDXZm6CWbcdq5k/4DZErcj7k1Qc1IYg0U01ceY9p3ShkhWG6b5Jd+AOajaG16kcuY9jY91tjMehYZwOc6Sb1eeYalC4D36HYcpRw6SDqU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=NZxvxnz0; 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="NZxvxnz0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DFD1AC4CEF1; Tue, 26 Aug 2025 13:20:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1756214424; bh=1hZUlWBCN7Mw5Tud1DRZI1GlZjc2xdBKHisv5jOU1R0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NZxvxnz0vslX+Hk2ZR2qmlXmdGqNUnhYui7BX20jKtbixXEN9yaI+cJ/s5HjkJcSo hOl769oAkmtVRBNRGnjimhltygXgkn09ZKq2adT70gdaxUakRUuEGN/Lcsa76psVu+ 8cISVcLeKhAaojASwrCuQf+UQd93BuGtJWyllQ9g= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, "John Warthog9 Hawley" , Dhaval Giani , Steven Rostedt , Sasha Levin Subject: [PATCH 6.1 115/482] ktest.pl: Prevent recursion of default variable options Date: Tue, 26 Aug 2025 13:06:08 +0200 Message-ID: <20250826110933.667656253@linuxfoundation.org> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20250826110930.769259449@linuxfoundation.org> References: <20250826110930.769259449@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Steven Rostedt [ Upstream commit 61f7e318e99d3b398670518dd3f4f8510d1800fc ] If a default variable contains itself, do not recurse on it. For example: ADD_CONFIG := ${CONFIG_DIR}/temp_config DEFAULTS ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG} The above works because the temp variable ADD_CONFIG (is a temp because it is created with ":=") is already defined, it will be substituted in the variable option. But if it gets commented out: # ADD_CONFIG := ${CONFIG_DIR}/temp_config DEFAULTS ADD_CONFIG = ${CONFIG_DIR}/default_config ${ADD_CONFIG} Then the above will go into a recursive loop where ${ADD_CONFIG} will get replaced with the current definition of ADD_CONFIG which contains the ${ADD_CONFIG} and that will also try to get converted. ktest.pl will error after 100 attempts of recursion and fail. When replacing a variable with the default variable, if the default variable contains itself, do not replace it. Cc: "John Warthog9 Hawley" Cc: Dhaval Giani Cc: Greg KH Link: https://lore.kernel.org/20250718202053.732189428@kernel.org Signed-off-by: Steven Rostedt Signed-off-by: Sasha Levin --- tools/testing/ktest/ktest.pl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/testing/ktest/ktest.pl b/tools/testing/ktest/ktest.pl index 2109bd42c144..26544bba3f8f 100755 --- a/tools/testing/ktest/ktest.pl +++ b/tools/testing/ktest/ktest.pl @@ -1351,7 +1351,10 @@ sub __eval_option { # If a variable contains itself, use the default var if (($var eq $name) && defined($opt{$var})) { $o = $opt{$var}; - $retval = "$retval$o"; + # Only append if the default doesn't contain itself + if ($o !~ m/\$\{$var\}/) { + $retval = "$retval$o"; + } } elsif (defined($opt{$o})) { $o = $opt{$o}; $retval = "$retval$o"; -- 2.39.5