From c1513d6fb859e684516d3810540bc6cea44d949e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 20 Jul 2017 11:17:30 +0200 Subject: [PATCH] delete queue-4.12/x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch --- queue-4.12/series | 1 - ...y-the-efi-struct-members-used-by-xen.patch | 101 ------------------ 2 files changed, 102 deletions(-) delete mode 100644 queue-4.12/x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch diff --git a/queue-4.12/series b/queue-4.12/series index 3d9ed81270a..ddaa3bea1f4 100644 --- a/queue-4.12/series +++ b/queue-4.12/series @@ -23,7 +23,6 @@ adding-the-type-of-exported-symbols.patch sparc64-fix-gup_huge_pmd.patch brcmfmac-fix-a-memory-leak-in-error-handling-path-in-brcmf_cfg80211_attach.patch brcmfmac-fix-glom_skb-leak-in-brcmf_sdiod_recv_chain.patch -x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch efi-process-the-memattr-table-only-if-efi_memmap-is-enabled.patch cfg80211-define-nla_policy-for-nl80211_attr_local_mesh_power_mode.patch cfg80211-validate-frequencies-nested-in-nl80211_attr_scan_frequencies.patch diff --git a/queue-4.12/x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch b/queue-4.12/x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch deleted file mode 100644 index 3e003d34533..00000000000 --- a/queue-4.12/x86-xen-efi-initialize-only-the-efi-struct-members-used-by-xen.patch +++ /dev/null @@ -1,101 +0,0 @@ -From 6c64447ec58b0bac612732303f7ab04562124587 Mon Sep 17 00:00:00 2001 -From: Daniel Kiper -Date: Thu, 22 Jun 2017 12:51:37 +0200 -Subject: x86/xen/efi: Initialize only the EFI struct members used by Xen - -From: Daniel Kiper - -commit 6c64447ec58b0bac612732303f7ab04562124587 upstream. - -The current approach, which is the wholesale efi struct initialization from -a 'efi_xen' local template is not robust. Usually if new member is defined -then it is properly initialized in drivers/firmware/efi/efi.c, but not in -arch/x86/xen/efi.c. - -The effect is that the Xen initialization clears any fields the generic code -might have set and the Xen code does not know about yet. - -I saw this happen a few times, so let's initialize only the EFI struct members -used by Xen and maintain no local duplicate, to avoid such issues in the future. - -Signed-off-by: Daniel Kiper -Reviewed-by: Boris Ostrovsky -Acked-by: Ard Biesheuvel -Cc: Linus Torvalds -Cc: Peter Zijlstra -Cc: Thomas Gleixner -Cc: andrew.cooper3@citrix.com -Cc: jgross@suse.com -Cc: linux-efi@vger.kernel.org -Cc: matt@codeblueprint.co.uk -Cc: xen-devel@lists.xenproject.org -Link: http://lkml.kernel.org/r/1498128697-12943-3-git-send-email-daniel.kiper@oracle.com -[ Clarified the changelog. ] -Signed-off-by: Ingo Molnar -Signed-off-by: Greg Kroah-Hartman - ---- - arch/x86/xen/efi.c | 45 ++++++++++++--------------------------------- - 1 file changed, 12 insertions(+), 33 deletions(-) - ---- a/arch/x86/xen/efi.c -+++ b/arch/x86/xen/efi.c -@@ -54,38 +54,6 @@ static efi_system_table_t efi_systab_xen - .tables = EFI_INVALID_TABLE_ADDR /* Initialized later. */ - }; - --static const struct efi efi_xen __initconst = { -- .systab = NULL, /* Initialized later. */ -- .runtime_version = 0, /* Initialized later. */ -- .mps = EFI_INVALID_TABLE_ADDR, -- .acpi = EFI_INVALID_TABLE_ADDR, -- .acpi20 = EFI_INVALID_TABLE_ADDR, -- .smbios = EFI_INVALID_TABLE_ADDR, -- .smbios3 = EFI_INVALID_TABLE_ADDR, -- .sal_systab = EFI_INVALID_TABLE_ADDR, -- .boot_info = EFI_INVALID_TABLE_ADDR, -- .hcdp = EFI_INVALID_TABLE_ADDR, -- .uga = EFI_INVALID_TABLE_ADDR, -- .uv_systab = EFI_INVALID_TABLE_ADDR, -- .fw_vendor = EFI_INVALID_TABLE_ADDR, -- .runtime = EFI_INVALID_TABLE_ADDR, -- .config_table = EFI_INVALID_TABLE_ADDR, -- .get_time = xen_efi_get_time, -- .set_time = xen_efi_set_time, -- .get_wakeup_time = xen_efi_get_wakeup_time, -- .set_wakeup_time = xen_efi_set_wakeup_time, -- .get_variable = xen_efi_get_variable, -- .get_next_variable = xen_efi_get_next_variable, -- .set_variable = xen_efi_set_variable, -- .query_variable_info = xen_efi_query_variable_info, -- .update_capsule = xen_efi_update_capsule, -- .query_capsule_caps = xen_efi_query_capsule_caps, -- .get_next_high_mono_count = xen_efi_get_next_high_mono_count, -- .reset_system = xen_efi_reset_system, -- .set_virtual_address_map = NULL, /* Not used under Xen. */ -- .flags = 0 /* Initialized later. */ --}; -- - static efi_system_table_t __init *xen_efi_probe(void) - { - struct xen_platform_op op = { -@@ -102,7 +70,18 @@ static efi_system_table_t __init *xen_ef - - /* Here we know that Xen runs on EFI platform. */ - -- efi = efi_xen; -+ efi.get_time = xen_efi_get_time; -+ efi.set_time = xen_efi_set_time; -+ efi.get_wakeup_time = xen_efi_get_wakeup_time; -+ efi.set_wakeup_time = xen_efi_set_wakeup_time; -+ efi.get_variable = xen_efi_get_variable; -+ efi.get_next_variable = xen_efi_get_next_variable; -+ efi.set_variable = xen_efi_set_variable; -+ efi.query_variable_info = xen_efi_query_variable_info; -+ efi.update_capsule = xen_efi_update_capsule; -+ efi.query_capsule_caps = xen_efi_query_capsule_caps; -+ efi.get_next_high_mono_count = xen_efi_get_next_high_mono_count; -+ efi.reset_system = xen_efi_reset_system; - - efi_systab_xen.tables = info->cfg.addr; - efi_systab_xen.nr_tables = info->cfg.nent; -- 2.47.3