path: root/scripts
diff options
authorThomas Hebb <tommyhebb@gmail.com>2019-12-09 00:19:17 -0800
committerMasahiro Yamada <masahiroy@kernel.org>2019-12-17 19:21:07 +0900
commit272a72103012862e3a24ea06635253ead0b6e808 (patch)
tree8e603d55c69699f5509d5df6d053ab06b4342f76 /scripts
parentscripts/kallsyms: fix offset overflow of kallsyms_relative_base (diff)
kconfig: don't crash on NULL expressions in expr_eq()
NULL expressions are taken to always be true, as implemented by the expr_is_yes() macro and by several other functions in expr.c. As such, they ought to be valid inputs to expr_eq(), which compares two expressions. Signed-off-by: Thomas Hebb <tommyhebb@gmail.com> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Diffstat (limited to '')
1 files changed, 7 insertions, 0 deletions
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 77ffff3a053c..9f1de58e9f0c 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -254,6 +254,13 @@ static int expr_eq(struct expr *e1, struct expr *e2)
int res, old_count;
+ /*
+ * A NULL expr is taken to be yes, but there's also a different way to
+ * represent yes. expr_is_yes() checks for either representation.
+ */
+ if (!e1 || !e2)
+ return expr_is_yes(e1) && expr_is_yes(e2);
if (e1->type != e2->type)
return 0;
switch (e1->type) {