MIRRORS/linux-yocto
1
0
Fork 0
mirror of git://git.yoctoproject.org/linux-yocto.git synced 2025-10-23 07:23:12 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

ktest.pl: Prevent recursion of default variable options

Browse Source 
[ Upstream commit 61f7e318e9 ]

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" <warthog9@kernel.org>
Cc: Dhaval Giani <dhaval.giani@gmail.com>
Cc: Greg KH <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/20250718202053.732189428@kernel.org
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Steven Rostedt 2025-07-18 16:18:44 -04:00 committed by Greg Kroah-Hartman
parent 2ef17d1476
commit 1d325fed24
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tools/testing/ktest/ktest.pl
View File

@ -1371,7 +1371,10 @@ sub __eval_option {
# If a variable contains itself, use the default var # If a variable contains itself, use the default var
if (($var eq $name) && defined($opt{$var})) { if (($var eq $name) && defined($opt{$var})) {
$o = $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})) { } elsif (defined($opt{$o})) {
$o = $opt{$o}; $o = $opt{$o};
$retval = "$retval$o"; $retval = "$retval$o";