diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-12-20 03:18:42 +0900 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-12-30 11:54:01 +0100 |
| commit | 87c0d2ab8a8e0bf7bf5d0abf0d695aeab6a8af3b (patch) | |
| tree | f27069403b5c9d51dc673bfcfdf66f820546ae81 /scripts | |
| parent | edc71c5fe563a99a8af1c5a1253d34a244bf9e13 (diff) | |
| download | linux-stable-87c0d2ab8a8e0bf7bf5d0abf0d695aeab6a8af3b.tar.gz linux-stable-87c0d2ab8a8e0bf7bf5d0abf0d695aeab6a8af3b.tar.bz2 linux-stable-87c0d2ab8a8e0bf7bf5d0abf0d695aeab6a8af3b.zip | |
kconfig: fix return value of do_error_if()
[ 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>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/kconfig/preprocess.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/kconfig/preprocess.c b/scripts/kconfig/preprocess.c index 0243086fb168..0590f86df6e4 100644 --- a/scripts/kconfig/preprocess.c +++ b/scripts/kconfig/preprocess.c @@ -114,7 +114,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[]) |