]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
kconfig: fix return value of do_error_if()
authorMasahiro Yamada <masahiroy@kernel.org>
Sat, 19 Dec 2020 18:18:42 +0000 (03:18 +0900)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 30 Dec 2020 10:26:06 +0000 (11:26 +0100)
[ Upstream commit 135b4957eac43af2aedf8e2a277b9540f33c2558 ]

$(error-if,...) is expanded to an empty string. Currently, it relies on
eval_clause() returning xstrdup("") when all attempts for expansion fail,
but the correct implementation is to make do_error_if() return xstrdup("").

Fixes: 1d6272e6fe43 ("kconfig: add 'info', 'warning-if', and 'error-if' built-in functions")
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
scripts/kconfig/preprocess.c

index 5ca2df790d3cfa5f4253a33a303219aaa8fc4394..389814b02d06b4fad0033500dd1dcb23dcee1841 100644 (file)
@@ -111,7 +111,7 @@ static char *do_error_if(int argc, char *argv[])
        if (!strcmp(argv[0], "y"))
                pperror("%s", argv[1]);
 
-       return NULL;
+       return xstrdup("");
 }
 
 static char *do_filename(int argc, char *argv[])