Commit 50cccc69 authored by Vivek Goyal's avatar Vivek Goyal Committed by Linus Torvalds
Browse files

[PATCH] Kexec on panic vmlinux initrd fix 



This is a minor bug fix in kexec to resolve the problem of loading panic
kernel with initrd.

o Problem: Loading a capture kenrel fails if initrd is also being loaded.
  This has been observed for vmlinux image for kexec on panic case.

o This patch fixes the problem. In segment location and size verification
  logic, minor correction has been done. Segment memory end (mend) should be
  mstart + memsz - 1. This one byte offset was source of failure for initrd
  loading which was being loaded at hole boundary.

Signed-off-by: default avatarVivek Goyal <vgoyal@in.ibm.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent dc009d92

kernel/kexec.c

+1 −1
Original line number Diff line number Diff line
@@ -264,7 +264,7 @@ static int kimage_crash_alloc(struct kimage **rimage, unsigned long entry, 
	for (i = 0; i < nr_segments; i++) {

		unsigned long mstart, mend;

		mstart = image->segment[i].mem;

		mend = mstart + image->segment[i].memsz;

		mend = mstart + image->segment[i].memsz - 1;

		/* Ensure we are within the crash kernel limits */

		if ((mstart < crashk_res.start) || (mend > crashk_res.end))

			goto out;