Commit 047ab74d authored by Thomas Hebb's avatar Thomas Hebb Committed by Khalid Elmously

kconfig: don't crash on NULL expressions in expr_eq()

BugLink: https://bugs.launchpad.net/bugs/1859640

[ Upstream commit 272a7210 ]

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: default avatarThomas Hebb <tommyhebb@gmail.com>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarConnor Kuehl <connor.kuehl@canonical.com>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
parent 5e4c045d
...@@ -201,6 +201,13 @@ static int expr_eq(struct expr *e1, struct expr *e2) ...@@ -201,6 +201,13 @@ static int expr_eq(struct expr *e1, struct expr *e2)
{ {
int res, old_count; 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) if (e1->type != e2->type)
return 0; return 0;
switch (e1->type) { switch (e1->type) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment