]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.14-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Jun 2022 10:00:09 +0000 (12:00 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 30 Jun 2022 10:00:09 +0000 (12:00 +0200)
added patches:
xen-unexport-__init-annotated-xen_xlate_map_ballooned_pages.patch

queue-4.14/series
queue-4.14/xen-unexport-__init-annotated-xen_xlate_map_ballooned_pages.patch [new file with mode: 0644]

index 6ee79fe1559d91961237bfce47e7ece40660df90..d9ce63f20f80bc494c41cabfefe318ebcfee9fcc 100644 (file)
@@ -29,3 +29,4 @@ arm-cns3xxx-fix-refcount-leak-in-cns3xxx_init.patch
 modpost-fix-section-mismatch-check-for-exported-init-exit-sections.patch
 powerpc-pseries-wire-up-rng-during-setup_arch.patch
 drm-remove-drm_fb_helper_modinit.patch
+xen-unexport-__init-annotated-xen_xlate_map_ballooned_pages.patch
diff --git a/queue-4.14/xen-unexport-__init-annotated-xen_xlate_map_ballooned_pages.patch b/queue-4.14/xen-unexport-__init-annotated-xen_xlate_map_ballooned_pages.patch
new file mode 100644 (file)
index 0000000..e89ce61
--- /dev/null
@@ -0,0 +1,47 @@
+From dbac14a5a05ff8e1ce7c0da0e1f520ce39ec62ea Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Mon, 6 Jun 2022 13:59:20 +0900
+Subject: xen: unexport __init-annotated xen_xlate_map_ballooned_pages()
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit dbac14a5a05ff8e1ce7c0da0e1f520ce39ec62ea upstream.
+
+EXPORT_SYMBOL and __init is a bad combination because the .init.text
+section is freed up after the initialization. Hence, modules cannot
+use symbols annotated __init. The access to a freed symbol may end up
+with kernel panic.
+
+modpost used to detect it, but it has been broken for a decade.
+
+Recently, I fixed modpost so it started to warn it again, then this
+showed up in linux-next builds.
+
+There are two ways to fix it:
+
+  - Remove __init
+  - Remove EXPORT_SYMBOL
+
+I chose the latter for this case because none of the in-tree call-sites
+(arch/arm/xen/enlighten.c, arch/x86/xen/grant-table.c) is compiled as
+modular.
+
+Fixes: 243848fc018c ("xen/grant-table: Move xlated_setup_gnttab_pages to common place")
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Reviewed-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
+Acked-by: Stefano Stabellini <sstabellini@kernel.org>
+Link: https://lore.kernel.org/r/20220606045920.4161881-1-masahiroy@kernel.org
+Signed-off-by: Juergen Gross <jgross@suse.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/xen/xlate_mmu.c |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/xen/xlate_mmu.c
++++ b/drivers/xen/xlate_mmu.c
+@@ -262,4 +262,3 @@ int __init xen_xlate_map_ballooned_pages
+       return 0;
+ }
+-EXPORT_SYMBOL_GPL(xen_xlate_map_ballooned_pages);