Commit d4c4fed0 authored Aug 15, 2016 by Jan Beulich Committed by Matt Fleming Sep 05, 2016

efi: Make for_each_efi_memory_desc_in_map() cope with running on Xen



While commit 55f1ea15 ("efi: Fix for_each_efi_memory_desc_in_map()
for empty memmaps") made an attempt to deal with empty memory maps, it
didn't address the case where the map field never gets set, as is
apparently the case when running under Xen.

Reported-by:  <lists@ssl-mail.com>
Tested-by:  <lists@ssl-mail.com>
Cc: Vitaly Kuznetsov <vkuznets@redhat.com>
Cc: Jiri Slaby <jslaby@suse.cz>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: <stable@vger.kernel.org> # v4.7+
Signed-off-by: Jan Beulich <jbeulich@suse.com>
[ Guard the loop with a NULL check instead of pointer underflow ]
Signed-off-by: Matt Fleming <matt@codeblueprint.co.uk>

parent c6935931

include/linux/efi.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -946,7 +946,7 @@ extern int efi_memattr_apply_permissions(struct mm_struct *mm,
		/* Iterate through an efi_memory_map */
		#define for_each_efi_memory_desc_in_map(m, md) \
		for ((md) = (m)->map; \
		((void *)(md) + (m)->desc_size) <= (m)->map_end; \
		(md) && ((void *)(md) + (m)->desc_size) <= (m)->map_end; \
		(md) = (void *)(md) + (m)->desc_size)

		/**

Admin message