From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45431 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933890AbcIVNfP (ORCPT ); Thu, 22 Sep 2016 09:35:15 -0400 Subject: Patch "efi: Make for_each_efi_memory_desc_in_map() cope with running on Xen" has been added to the 4.7-stable tree To: JBeulich@suse.com, gregkh@linuxfoundation.org, jbeulich@suse.com, jslaby@suse.cz, lists@ssl-mail.com, mark.rutland@arm.com, matt@codeblueprint.co.uk, vkuznets@redhat.com Cc: , From: Date: Thu, 22 Sep 2016 15:34:34 +0200 Message-ID: <1474551274198241@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled efi: Make for_each_efi_memory_desc_in_map() cope with running on Xen to the 4.7-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: efi-make-for_each_efi_memory_desc_in_map-cope-with-running-on-xen.patch and it can be found in the queue-4.7 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From d4c4fed08f31f3746000c46cb1b20bed2959547a Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Mon, 15 Aug 2016 09:05:45 -0600 Subject: efi: Make for_each_efi_memory_desc_in_map() cope with running on Xen From: Jan Beulich commit d4c4fed08f31f3746000c46cb1b20bed2959547a upstream. While commit 55f1ea15216 ("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: Tested-by: Cc: Vitaly Kuznetsov Cc: Jiri Slaby Cc: Mark Rutland Signed-off-by: Jan Beulich [ Guard the loop with a NULL check instead of pointer underflow ] Signed-off-by: Matt Fleming Signed-off-by: Greg Kroah-Hartman --- include/linux/efi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/include/linux/efi.h +++ b/include/linux/efi.h @@ -1005,7 +1005,7 @@ extern int efi_memattr_apply_permissions /* 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) /** Patches currently in stable-queue which might be from JBeulich@suse.com are queue-4.7/efi-make-for_each_efi_memory_desc_in_map-cope-with-running-on-xen.patch