From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 12 Mar 2018 16:35:02 +0000 (+0100)
Subject: 4.4-stable patches
X-Git-Tag: v4.14.27~35
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=acd93deafd38dacde33815294ab17fd9f51623ab;p=thirdparty%2Fkernel%2Fstable-queue.git

4.4-stable patches

added patches:
	nospec-include-asm-barrier.h-dependency.patch
---

diff --git a/queue-4.4/alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch b/queue-4.4/alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch
deleted file mode 100644
index 0e03343a020..00000000000
--- a/queue-4.4/alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d5078193e56bb24f4593f00102a3b5e07bb84ee0 Mon Sep 17 00:00:00 2001
-From: Hui Wang <hui.wang@canonical.com>
-Date: Fri, 2 Mar 2018 13:05:36 +0800
-Subject: ALSA: hda - Fix a wrong FIXUP for alc289 on Dell machines
-
-From: Hui Wang <hui.wang@canonical.com>
-
-commit d5078193e56bb24f4593f00102a3b5e07bb84ee0 upstream.
-
-With the alc289, the Pin 0x1b is Headphone-Mic, so we should assign
-ALC269_FIXUP_DELL4_MIC_NO_PRESENCE rather than
-ALC225_FIXUP_DELL1_MIC_NO_PRESENCE to it. And this change is suggested
-by Kailang of Realtek and is verified on the machine.
-
-Fixes: 3f2f7c553d07 ("ALSA: hda - Fix headset mic detection problem for two Dell machines")
-Cc: Kailang Yang <kailang@realtek.com>
-Cc: <stable@vger.kernel.org>
-Signed-off-by: Hui Wang <hui.wang@canonical.com>
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-
----
- sound/pci/hda/patch_realtek.c |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/sound/pci/hda/patch_realtek.c
-+++ b/sound/pci/hda/patch_realtek.c
-@@ -6071,7 +6071,7 @@ static const struct snd_hda_pin_quirk al
- 		{0x12, 0x90a60120},
- 		{0x14, 0x90170110},
- 		{0x21, 0x0321101f}),
--	SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC225_FIXUP_DELL1_MIC_NO_PRESENCE,
-+	SND_HDA_PIN_QUIRK(0x10ec0289, 0x1028, "Dell", ALC269_FIXUP_DELL4_MIC_NO_PRESENCE,
- 		{0x12, 0xb7a60130},
- 		{0x14, 0x90170110},
- 		{0x21, 0x04211020}),
diff --git a/queue-4.4/nospec-include-asm-barrier.h-dependency.patch b/queue-4.4/nospec-include-asm-barrier.h-dependency.patch
new file mode 100644
index 00000000000..115c5b30b71
--- /dev/null
+++ b/queue-4.4/nospec-include-asm-barrier.h-dependency.patch
@@ -0,0 +1,49 @@
+From eb6174f6d1be16b19cfa43dac296bfed003ce1a6 Mon Sep 17 00:00:00 2001
+From: Dan Williams <dan.j.williams@intel.com>
+Date: Fri, 16 Feb 2018 13:20:54 -0800
+Subject: nospec: Include <asm/barrier.h> dependency
+
+From: Dan Williams <dan.j.williams@intel.com>
+
+commit eb6174f6d1be16b19cfa43dac296bfed003ce1a6 upstream.
+
+The nospec.h header expects the per-architecture header file
+<asm/barrier.h> to optionally define array_index_mask_nospec(). Include
+that dependency to prevent inadvertent fallback to the default
+array_index_mask_nospec() implementation.
+
+The default implementation may not provide a full mitigation
+on architectures that perform data value speculation.
+
+Reported-by: Christian Borntraeger <borntraeger@de.ibm.com>
+Signed-off-by: Dan Williams <dan.j.williams@intel.com>
+Cc: Andy Lutomirski <luto@kernel.org>
+Cc: Arjan van de Ven <arjan@linux.intel.com>
+Cc: Borislav Petkov <bp@alien8.de>
+Cc: Dave Hansen <dave.hansen@linux.intel.com>
+Cc: David Woodhouse <dwmw2@infradead.org>
+Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Cc: Josh Poimboeuf <jpoimboe@redhat.com>
+Cc: Linus Torvalds <torvalds@linux-foundation.org>
+Cc: Peter Zijlstra <peterz@infradead.org>
+Cc: Thomas Gleixner <tglx@linutronix.de>
+Cc: Will Deacon <will.deacon@arm.com>
+Cc: linux-arch@vger.kernel.org
+Link: http://lkml.kernel.org/r/151881605404.17395.1341935530792574707.stgit@dwillia2-desk3.amr.corp.intel.com
+Signed-off-by: Ingo Molnar <mingo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ include/linux/nospec.h |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/include/linux/nospec.h
++++ b/include/linux/nospec.h
+@@ -5,6 +5,7 @@
+ 
+ #ifndef _LINUX_NOSPEC_H
+ #define _LINUX_NOSPEC_H
++#include <asm/barrier.h>
+ 
+ /**
+  * array_index_mask_nospec() - generate a ~0 mask when index < size, 0 otherwise
diff --git a/queue-4.4/series b/queue-4.4/series
index eaedb821da7..bd4fefd24a0 100644
--- a/queue-4.4/series
+++ b/queue-4.4/series
@@ -21,6 +21,6 @@ x86-mce-serialize-sysfs-changes.patch
 alsa-hda-realtek-fix-dock-line-out-volume-on-dell-precision-7520.patch
 alsa-seq-don-t-allow-resizing-pool-in-use.patch
 alsa-seq-more-protection-for-concurrent-write-and-ioctl-races.patch
-alsa-hda-fix-a-wrong-fixup-for-alc289-on-dell-machines.patch
 alsa-hda-add-dock-and-led-support-for-hp-elitebook-820-g3.patch
 alsa-hda-add-dock-and-led-support-for-hp-probook-640-g2.patch
+nospec-include-asm-barrier.h-dependency.patch