Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38;
Message-ID: <fd5f08c0-4603-471a-bd6f-44a2e6191ac7@smile.fr>
Date:   Sun, 26 Nov 2023 00:10:44 +0100
MIME-Version: 1.0
User-Agent: Mozilla Thunderbird
Subject: Re: [PATCH 2/2] kconfig: default to zero if int/hex symbol lacks
 default property
To:     Masahiro Yamada <masahiroy@kernel.org>,
        linux-kbuild@vger.kernel.org
Cc:     linux-kernel@vger.kernel.org
References: <20231125163559.824210-1-masahiroy@kernel.org>
 <20231125163559.824210-2-masahiroy@kernel.org>
Content-Language: en-US
From:   Yoann Congal <yoann.congal@smile.fr>
Organization: Smile ECS
In-Reply-To: <20231125163559.824210-2-masahiroy@kernel.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Le 25/11/2023 à 17:35, Masahiro Yamada a écrit :
> When a default property is missing in an int or hex symbol, it defaults
> to an empty string, which is not a valid symbol value.
> 
> It results in a incorrect .config, and can also lead to an infinite
> loop in scripting.
> 
> Use "0" for int and "0x0" for hex as a default value.
> 
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

Thanks! It does fix our problem.

Reviewed-by: Yoann Congal <yoann.congal@smile.fr>

> ---
> 
>  scripts/kconfig/symbol.c | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
> 
> diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
> index f7075d148ac7..a5a4f9153eb7 100644
> --- a/scripts/kconfig/symbol.c
> +++ b/scripts/kconfig/symbol.c
> @@ -338,7 +338,11 @@ void sym_calc_value(struct symbol *sym)
>  
>  	switch (sym->type) {
>  	case S_INT:
> +		newval.val = "0";
> +		break;
>  	case S_HEX:
> +		newval.val = "0x0";
> +		break;
>  	case S_STRING:
>  		newval.val = "";
>  		break;
> @@ -746,14 +750,17 @@ const char *sym_get_string_default(struct symbol *sym)
>  		case yes: return "y";
>  		}
>  	case S_INT:
> +		if (!str[0])
> +			str = "0";
> +		break;
>  	case S_HEX:
> -		return str;
> -	case S_STRING:
> -		return str;
> -	case S_UNKNOWN:
> +		if (!str[0])
> +			str = "0x0";
> +		break;
> +	default:
>  		break;
>  	}
> -	return "";
> +	return str;
>  }
>  
>  const char *sym_get_string_value(struct symbol *sym)

-- 
Yoann Congal
Smile ECS - Tech Expert