linux-kernel - Re: [PATCH] arm64/kexec: Use consistent convention of initializing 'kxec_buf.mem' with KEXEC_BUF_MEM

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <17b63547-0f03-baaf-775c-2da75aa40ee3@gmail.com>
Date:   Thu, 11 Jul 2019 16:52:10 +0200
From:   Matthias Brugger <matthias.bgg@...il.com>
To:     Bhupesh Sharma <bhsharma@...hat.com>,
        linux-arm-kernel@...ts.infradead.org
Cc:     will.deacon@....com, linux-kernel@...r.kernel.org,
        takahiro.akashi@...aro.org, james.morse@....com,
        bhupesh.linux@...il.com
Subject: Re: [PATCH] arm64/kexec: Use consistent convention of initializing
 'kxec_buf.mem' with KEXEC_BUF_MEM_UNKNOWN



On 11/07/2019 13:57, Bhupesh Sharma wrote:
> With commit b6664ba42f14 ("s390, kexec_file: drop arch_kexec_mem_walk()"),
> we introduced the KEXEC_BUF_MEM_UNKNOWN macro. If kexec_buf.mem is set
> to this value, kexec_locate_mem_hole() will try to allocate free memory.
> 
> While other arch(s) like s390 and x86_64 already use this macro to
> initialize kexec_buf.mem with, arm64 uses an equivalent value of 0.
> Replace it with KEXEC_BUF_MEM_UNKNOWN, to keep the convention of
> initializing 'kxec_buf.mem' consistent across various archs.
> 
> Cc: takahiro.akashi@...aro.org
> Cc: james.morse@....com
> Cc: will.deacon@....com
> Cc: linux-arm-kernel@...ts.infradead.org
> Signed-off-by: Bhupesh Sharma <bhsharma@...hat.com>
> ---

Reviewed-by: Matthias Brugger <mbrugger@...e.com>

>  arch/arm64/kernel/kexec_image.c        | 2 +-
>  arch/arm64/kernel/machine_kexec_file.c | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm64/kernel/kexec_image.c b/arch/arm64/kernel/kexec_image.c
> index 2514fd6f12cb..29a9428486a5 100644
> --- a/arch/arm64/kernel/kexec_image.c
> +++ b/arch/arm64/kernel/kexec_image.c
> @@ -84,7 +84,7 @@ static void *image_load(struct kimage *image,
>  
>  	kbuf.buffer = kernel;
>  	kbuf.bufsz = kernel_len;
> -	kbuf.mem = 0;
> +	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
>  	kbuf.memsz = le64_to_cpu(h->image_size);
>  	text_offset = le64_to_cpu(h->text_offset);
>  	kbuf.buf_align = MIN_KIMG_ALIGN;
> diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
> index 58871333737a..ba78ee7ca990 100644
> --- a/arch/arm64/kernel/machine_kexec_file.c
> +++ b/arch/arm64/kernel/machine_kexec_file.c
> @@ -177,7 +177,7 @@ int load_other_segments(struct kimage *image,
>  	if (initrd) {
>  		kbuf.buffer = initrd;
>  		kbuf.bufsz = initrd_len;
> -		kbuf.mem = 0;
> +		kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
>  		kbuf.memsz = initrd_len;
>  		kbuf.buf_align = 0;
>  		/* within 1GB-aligned window of up to 32GB in size */
> @@ -204,7 +204,7 @@ int load_other_segments(struct kimage *image,
>  	dtb_len = fdt_totalsize(dtb);
>  	kbuf.buffer = dtb;
>  	kbuf.bufsz = dtb_len;
> -	kbuf.mem = 0;
> +	kbuf.mem = KEXEC_BUF_MEM_UNKNOWN;
>  	kbuf.memsz = dtb_len;
>  	/* not across 2MB boundary */
>  	kbuf.buf_align = SZ_2M;
>