Commit cdf4b3fa authored Jan 20, 2016 by Xunlei Pang Committed by Linus Torvalds Jan 20, 2016

kexec: set KEXEC_TYPE_CRASH before sanity_check_segment_list()

sanity_check_segment_list() checks KEXEC_TYPE_CRASH flag to ensure all the
segments of the loaded crash kernel are within the kernel crash resource
limits, so set the flag beforehand.

Signed-off-by: Xunlei Pang <xlpang@redhat.com>
Acked-by: Dave Young <dyoung@redhat.com>
Cc: Eric Biederman <ebiederm@xmission.com>
Cc: Vivek Goyal <vgoyal@redhat.com>
Acked-by: Baoquan He <bhe@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 9425676a

kernel/kexec.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -63,16 +63,16 @@ static int kimage_alloc_init(struct kimage **rimage, unsigned long entry,
		if (ret)
		goto out_free_image;

		ret = sanity_check_segment_list(image);
		if (ret)
		goto out_free_image;

		/* Enable the special crash kernel control page allocation policy. */
		if (kexec_on_panic) {
		/* Enable special crash kernel control page alloc policy. */
		image->control_page = crashk_res.start;
		image->type = KEXEC_TYPE_CRASH;
		}

		ret = sanity_check_segment_list(image);
		if (ret)
		goto out_free_image;

		/*
		* Find a location for the control code buffer, and add it
		* the vector of segments so that it's pages will also be

Admin message