Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kexec_file: fix incorrect temp_start value in locate_mem_hole_top_down()

temp_end represents the address of the last available byte. Therefore,
the starting address of the memory segment with temp_end as its last
available byte and a size of `kbuf->memsz`, that is, the value of
temp_start, should be `temp_end - kbuf->memsz + 1` instead of `temp_end -
kbuf->memsz`.

Additionally, use the ALIGN_DOWN macro instead of open-coding it directly
in locate_mem_hole_top_down() to improve code readability.

Link: https://lkml.kernel.org/r/20231217033528.303333-3-ytcoode@gmail.com
Signed-off-by: Yuntao Wang <ytcoode@gmail.com>
Acked-by: Baoquan He <bhe@redhat.com>
Cc: Borislav Petkov (AMD) <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jonathan Corbet <corbet@lwn.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

authored by

Yuntao Wang and committed by
Andrew Morton
18d565ea 816d334a

+2 -2
+2 -2
kernel/kexec_file.c
··· 434 434 unsigned long temp_start, temp_end; 435 435 436 436 temp_end = min(end, kbuf->buf_max); 437 - temp_start = temp_end - kbuf->memsz; 437 + temp_start = temp_end - kbuf->memsz + 1; 438 438 439 439 do { 440 440 /* align down start */ 441 - temp_start = temp_start & (~(kbuf->buf_align - 1)); 441 + temp_start = ALIGN_DOWN(temp_start, kbuf->buf_align); 442 442 443 443 if (temp_start < start || temp_start < kbuf->buf_min) 444 444 return 0;