lkml.org 
[lkml]   [2019]   [Dec]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Date
SubjectRe: [PATCH 2/4] kconfig: don't crash on NULL expressions in expr_eq()
On Mon, Dec 9, 2019 at 5:19 PM Thomas Hebb <tommyhebb@gmail.com> wrote:
>
> 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>
> ---

I applied this patch.
I fixed up the block comment style. Thanks.


diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index 8284444cc3fa..9f1de58e9f0c 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -254,8 +254,10 @@ 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. */
+ /*
+ * 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);




> scripts/kconfig/expr.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
> index 77ffff3a053c..8284444cc3fa 100644
> --- a/scripts/kconfig/expr.c
> +++ b/scripts/kconfig/expr.c
> @@ -254,6 +254,11 @@ 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) {
> --
> 2.24.0
>


--
Best Regards
Masahiro Yamada

\
 
 \ /
  Last update: 2019-12-17 11:22    [W:0.050 / U:3.104 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site