Home Home > GIT Browse > stable-xen
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2017-07-18 09:42:22 -0400
committerJeff Mahoney <jeffm@suse.com>2017-07-18 09:42:22 -0400
commitd41b6e7871d660923c20ebeb2f2ae7254a13da75 (patch)
tree82ca439ddd1dea75cd19731f97cb23b5fceb45cc
parentc3b3d1938c027e523df3fb803dfd1fb4612bcfda (diff)
parentff157794af07669641f3d38f24b7a1f21a66539e (diff)
Merge remote-tracking branch 'origin/users/jslaby/master/for-next'
-rw-r--r--patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch34
-rw-r--r--patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch40
-rw-r--r--patches.rpmify/get_builtin_firmware-gcc-7.patch36
-rw-r--r--patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch4
-rw-r--r--patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch4
-rw-r--r--patches.suse/0003-x86-dumpstack-fix-occasionally-missing-registers.patch4
-rw-r--r--patches.suse/0004-x86-dumpstack-fix-interrupt-and-exception-stack-boun.patch4
-rw-r--r--patches.suse/0005-objtool-add-ORC-unwind-table-generation.patch4
-rw-r--r--patches.suse/0006-objtool-x86-add-facility-for-asm-code-to-provide-unw.patch4
-rw-r--r--patches.suse/0007-x86-entry-64-add-unwind-hint-annotations.patch4
-rw-r--r--patches.suse/0008-x86-asm-add-unwind-hint-annotations-to-sync_core.patch4
-rw-r--r--series.conf3
12 files changed, 59 insertions, 86 deletions
diff --git a/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch b/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
new file mode 100644
index 0000000000..6ae3d65b96
--- /dev/null
+++ b/patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
@@ -0,0 +1,34 @@
+From: Florian Westphal <fw@strlen.de>
+Date: Mon, 10 Jul 2017 13:53:53 +0200
+Subject: netfilter: expect: fix crash when putting uninited expectation
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git
+Git-commit: 36ac344e16e04e3e55e8fed7446095a6458c64e6
+References: bnc#1048935
+
+We crash in __nf_ct_expect_check, it calls nf_ct_remove_expect on the
+uninitialised expectation instead of existing one, so del_timer chokes
+on random memory address.
+
+Fixes: ec0e3f01114ad32711243 ("netfilter: nf_ct_expect: Add nf_ct_remove_expect()")
+Reported-by: Sergey Kvachonok <ravenexp@gmail.com>
+Tested-by: Sergey Kvachonok <ravenexp@gmail.com>
+Cc: Gao Feng <fgao@ikuai8.com>
+Signed-off-by: Florian Westphal <fw@strlen.de>
+Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
+Signed-off-by: Jiri Slaby <jslaby@suse.cz>
+---
+ net/netfilter/nf_conntrack_expect.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/net/netfilter/nf_conntrack_expect.c
++++ b/net/netfilter/nf_conntrack_expect.c
+@@ -422,7 +422,7 @@ static inline int __nf_ct_expect_check(s
+ h = nf_ct_expect_dst_hash(net, &expect->tuple);
+ hlist_for_each_entry_safe(i, next, &nf_ct_expect_hash[h], hnode) {
+ if (expect_matches(i, expect)) {
+- if (nf_ct_remove_expect(expect))
++ if (nf_ct_remove_expect(i))
+ break;
+ } else if (expect_clash(i, expect)) {
+ ret = -EBUSY;
diff --git a/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch b/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch
deleted file mode 100644
index 01ae3b19a7..0000000000
--- a/patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Thu, 30 Mar 2017 10:52:48 +0200
-Subject: drm/i915: disable KASAN for handlers
-Patch-mainline: submitted, https://lkml.kernel.org/r/<20170330094627.29460-1-jslaby@suse.cz>
-References: bnc#1025903
-
-Handlers are currently the only blocker to compile the kernel with gcc 7
-and KASAN+use-after-scope enabled:
-drivers/gpu/drm/i915/gvt/handlers.c:2200:1: error: the frame size of 43760 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
-drivers/gpu/drm/i915/gvt/handlers.c:2402:1: error: the frame size of 9400 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
-drivers/gpu/drm/i915/gvt/handlers.c:2628:1: error: the frame size of 11256 bytes is larger than 2048 bytes [-Werror=frame-larger-than=]
-
-It is due to many expansions of MMIO_* macros in init_generic_mmio_info.
-INTEL_GVT_MMIO_OFFSET generates for each such line a __reg and an
-offset. There are too many for KASAN to keep up.
-
-So disable KASAN for this file.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
-Cc: Martin Liska <mliska@suse.cz>
-Cc: Zhenyu Wang <zhenyuw@linux.intel.com>
-Cc: Zhi Wang <zhi.a.wang@intel.com>
-Cc: Daniel Vetter <daniel.vetter@intel.com>
-Cc: Jani Nikula <jani.nikula@linux.intel.com>
-Cc: David Airlie <airlied@linux.ie>
-Cc: intel-gvt-dev@lists.freedesktop.org
-Cc: intel-gfx@lists.freedesktop.org
-Cc: dri-devel@lists.freedesktop.org
----
- drivers/gpu/drm/i915/gvt/Makefile | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/gpu/drm/i915/gvt/Makefile
-+++ b/drivers/gpu/drm/i915/gvt/Makefile
-@@ -6,3 +6,5 @@ GVT_SOURCE := gvt.o aperture_gm.o handle
- ccflags-y += -I$(src) -I$(src)/$(GVT_DIR)
- i915-y += $(addprefix $(GVT_DIR)/, $(GVT_SOURCE))
- obj-$(CONFIG_DRM_I915_GVT_KVMGT) += $(GVT_DIR)/kvmgt.o
-+
-+KASAN_SANITIZE_handlers.o := n
diff --git a/patches.rpmify/get_builtin_firmware-gcc-7.patch b/patches.rpmify/get_builtin_firmware-gcc-7.patch
deleted file mode 100644
index 890e1bb6d5..0000000000
--- a/patches.rpmify/get_builtin_firmware-gcc-7.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Jiri Slaby <jslaby@suse.cz>
-Date: Fri, 14 Oct 2016 07:37:32 +0200
-Subject: fix get_builtin_firmware compilation with gcc 7
-Patch-mainline: not yet, under discussion "firmware: declare __{start,end}_builtin_fw as pointers"
-References: bnc#1004626
-
-gcc 7 miscompiles the kernel since the kernel relies on undefined
-behaviour. Fix this for get_builtin_firmware, so that the kernel boots
-at least. The other VMLINUX_SYMBOLs have to be fixed too.
-
-Signed-off-by: Jiri Slaby <jslaby@suse.cz>
----
- arch/x86/kernel/cpu/microcode/core.c | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/arch/x86/kernel/cpu/microcode/core.c b/arch/x86/kernel/cpu/microcode/core.c
-index 5ce5155f0695..83f2bf7ff46d 100644
---- a/arch/x86/kernel/cpu/microcode/core.c
-+++ b/arch/x86/kernel/cpu/microcode/core.c
-@@ -97,9 +97,11 @@ extern struct builtin_fw __end_builtin_fw[];
- bool get_builtin_firmware(struct cpio_data *cd, const char *name)
- {
- #ifdef CONFIG_FW_LOADER
-- struct builtin_fw *b_fw;
-+ struct builtin_fw *b_fw = __start_builtin_fw;
-
-- for (b_fw = __start_builtin_fw; b_fw != __end_builtin_fw; b_fw++) {
-+ OPTIMIZER_HIDE_VAR(b_fw);
-+
-+ for (; b_fw != __end_builtin_fw; b_fw++) {
- if (!strcmp(name, b_fw->name)) {
- cd->size = b_fw->size;
- cd->data = b_fw->data;
---
-2.10.1
-
diff --git a/patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch b/patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch
index 3e4ff610ae..ff2c7b925e 100644
--- a/patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch
+++ b/patches.suse/0001-x86-entry-64-Refactor-IRQ-stacks-and-make-them-NMI-s.patch
@@ -1,7 +1,9 @@
From: Andy Lutomirski <luto@kernel.org>
Date: Fri, 30 Jun 2017 08:56:32 -0700
Subject: x86/entry/64: Refactor IRQ stacks and make them NMI-safe
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 1d3e53e8624a3ec85f4041ca6d973da7c1575938
References: bnc#1018348
This will allow IRQ stacks to nest inside NMIs or similar entries
diff --git a/patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch b/patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch
index accae242f1..da61df01d0 100644
--- a/patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch
+++ b/patches.suse/0002-x86-entry-64-Initialize-the-top-of-the-IRQ-stack-bef.patch
@@ -2,7 +2,9 @@ From: Andy Lutomirski <luto@kernel.org>
Date: Fri, 30 Jun 2017 08:56:33 -0700
Subject: x86/entry/64: Initialize the top of the IRQ stack before switching
stacks
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 2995590964da93e1fd9a91550f9c9d9fab28f160
References: bnc#1018348
The OOPS unwinder wants the word at the top of the IRQ stack to
diff --git a/patches.suse/0003-x86-dumpstack-fix-occasionally-missing-registers.patch b/patches.suse/0003-x86-dumpstack-fix-occasionally-missing-registers.patch
index 3ed238efb9..6ff74d7ac9 100644
--- a/patches.suse/0003-x86-dumpstack-fix-occasionally-missing-registers.patch
+++ b/patches.suse/0003-x86-dumpstack-fix-occasionally-missing-registers.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 5 Jul 2017 14:48:48 -0500
Subject: x86/dumpstack: fix occasionally missing registers
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: b0529becebde629ff6abf2afdca6def6824f4fa9
References: bnc#1018348
If two consecutive stack frames have pt_regs, the oops dump code fails
diff --git a/patches.suse/0004-x86-dumpstack-fix-interrupt-and-exception-stack-boun.patch b/patches.suse/0004-x86-dumpstack-fix-interrupt-and-exception-stack-boun.patch
index 4cd7c318b6..ecdbde63a7 100644
--- a/patches.suse/0004-x86-dumpstack-fix-interrupt-and-exception-stack-boun.patch
+++ b/patches.suse/0004-x86-dumpstack-fix-interrupt-and-exception-stack-boun.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 5 Jul 2017 14:54:20 -0500
Subject: x86/dumpstack: fix interrupt and exception stack boundary checks
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 5a3cf86978a1ac433407704ec280919751aa2699
References: bnc#1018348
On x86_64, the double fault exception stack is located immediately after
diff --git a/patches.suse/0005-objtool-add-ORC-unwind-table-generation.patch b/patches.suse/0005-objtool-add-ORC-unwind-table-generation.patch
index 235e325147..3e8a30e9c6 100644
--- a/patches.suse/0005-objtool-add-ORC-unwind-table-generation.patch
+++ b/patches.suse/0005-objtool-add-ORC-unwind-table-generation.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 31 May 2017 19:38:55 -0500
Subject: objtool: add ORC unwind table generation
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 627fce14809ba5610b0cb476cd0186d3fcedecfc
References: bnc#1018348
Now that objtool knows the states of all registers on the stack for each
diff --git a/patches.suse/0006-objtool-x86-add-facility-for-asm-code-to-provide-unw.patch b/patches.suse/0006-objtool-x86-add-facility-for-asm-code-to-provide-unw.patch
index a7210a2a1d..e9fbed0f76 100644
--- a/patches.suse/0006-objtool-x86-add-facility-for-asm-code-to-provide-unw.patch
+++ b/patches.suse/0006-objtool-x86-add-facility-for-asm-code-to-provide-unw.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 31 May 2017 19:44:58 -0500
Subject: objtool, x86: add facility for asm code to provide unwind hints
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 39358a033b2e4432052265c1fa0f36f572d8cfb5
References: bnc#1018348
Some asm (and inline asm) code does special things to the stack which
diff --git a/patches.suse/0007-x86-entry-64-add-unwind-hint-annotations.patch b/patches.suse/0007-x86-entry-64-add-unwind-hint-annotations.patch
index c8fc747fb6..b5f3a616fd 100644
--- a/patches.suse/0007-x86-entry-64-add-unwind-hint-annotations.patch
+++ b/patches.suse/0007-x86-entry-64-add-unwind-hint-annotations.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 31 May 2017 19:48:12 -0500
Subject: x86/entry/64: add unwind hint annotations
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 8c1f75587a18ca032da8f6376d1ed882d7095289
References: bnc#1018348
Add unwind hint annotations to entry_64.S. This will enable the ORC
diff --git a/patches.suse/0008-x86-asm-add-unwind-hint-annotations-to-sync_core.patch b/patches.suse/0008-x86-asm-add-unwind-hint-annotations-to-sync_core.patch
index 3ff6d28aab..a277c44595 100644
--- a/patches.suse/0008-x86-asm-add-unwind-hint-annotations-to-sync_core.patch
+++ b/patches.suse/0008-x86-asm-add-unwind-hint-annotations-to-sync_core.patch
@@ -1,7 +1,9 @@
From: Josh Poimboeuf <jpoimboe@redhat.com>
Date: Wed, 31 May 2017 20:02:47 -0500
Subject: x86/asm: add unwind hint annotations to sync_core()
-Patch-mainline: submitted Jun 28th 2017
+Patch-mainline: Queued in subsystem maintainer repository
+Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git
+Git-commit: 76846bf3cb09e98881cb4908385a0e899716b01f
References: bnc#1018348
This enables objtool to grok the iret in the middle of a C function.
diff --git a/series.conf b/series.conf
index 0db4005ad9..6423874604 100644
--- a/series.conf
+++ b/series.conf
@@ -51,8 +51,6 @@
########################################################
patches.rpmify/firmware-path
patches.rpmify/cloneconfig.diff
- patches.rpmify/get_builtin_firmware-gcc-7.patch
- patches.rpmify/drm-i915-disable-KASAN-for-handlers.patch
########################################################
# kbuild/module infrastructure fixes
@@ -211,6 +209,7 @@
# Netfilter
########################################################
patches.suse/netfilter-ip_conntrack_slp.patch
+ patches.fixes/netfilter-expect-fix-crash-when-putting-uninited-exp.patch
########################################################
# NFS