[Crash-utility] [PATCH 2/4] symbols: fix initialization of st->{pti_init, kaiser}_vmlinux

HAGIO KAZUHITO(萩尾 一仁) k-hagio-ab at nec.com
Wed Jul 22 05:09:23 UTC 2020


> -----Original Message-----
> From: HATAYAMA Daisuke <d.hatayama at jp.fujitsu.com>
> 
> In numeric_forward(), care must be taken both for x- and y- positions,
> but either of kaiser_init and pti_init is only for x- or y- position
> only. Fix this. Also, move the code in an appropriate position
> according to each symbol name in the alphabetical order.
> ---
>  symbols.c | 15 ++++++++++-----
>  1 file changed, 10 insertions(+), 5 deletions(-)
> 
> diff --git a/symbols.c b/symbols.c
> index b9de4a1..fa46e91 100644
> --- a/symbols.c
> +++ b/symbols.c
> @@ -12692,20 +12692,25 @@ numeric_forward(const void *P_x, const void *P_y)
>  		else if (STREQ(y->name, "idt_table"))
>  			st->idt_table_vmlinux = valueof(y);
> 
> +		if (STREQ(x->name, "kaiser_init"))
> +			st->pti_init_vmlinux = valueof(x);

Is this st->pti_init_vmlinux intended?
If st->kaiser_init_vmlinux is correct, I can fix when merging.

> +		else if (STREQ(y->name, "kaiser_init"))
> +			st->kaiser_init_vmlinux = valueof(y);
> +
>  		if (STREQ(x->name, "linux_banner"))
>  			st->linux_banner_vmlinux = valueof(x);
>  		else if (STREQ(y->name, "linux_banner"))
>  			st->linux_banner_vmlinux = valueof(y);
> 
> +		if (STREQ(x->name, "pti_init"))
> +			st->pti_init_vmlinux = valueof(x);
> +		else if (STREQ(y->name, "pti_init"))
> +			st->kaiser_init_vmlinux = valueof(y);

Ditto, but in reverse.

> +
>  		if (STREQ(x->name, "saved_command_line"))
>  			st->saved_command_line_vmlinux = valueof(x);
>  		else if (STREQ(y->name, "saved_command_line"))
>  			st->saved_command_line_vmlinux = valueof(y);
> -
> -		if (STREQ(x->name, "pti_init"))
> -			st->pti_init_vmlinux = valueof(x);
> -		else if (STREQ(y->name, "kaiser_init"))
> -			st->kaiser_init_vmlinux = valueof(y);
>  	}
> 
>    	xs = bfd_get_section(x);
> --
> 1.8.3.1





More information about the Crash-utility mailing list