4.18-stable patches

added patches:
	edac-add-missing-mem_lrddr4-entry-in-edac_mem_types.patch
	pty-fix-o_cloexec-for-tiocgptpeer.patch

diff --git a/queue-4.18/edac-add-missing-mem_lrddr4-entry-in-edac_mem_types.patch b/queue-4.18/edac-add-missing-mem_lrddr4-entry-in-edac_mem_types.patch
new file mode 100644 (file)
index 0000000..3eb241b
--- /dev/null
+++ b/queue-4.18/edac-add-missing-mem_lrddr4-entry-in-edac_mem_types.patch
@@ -0,0 +1,36 @@
+From b748f2de4b2f578599f46c6000683a8da755bf68 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 10 Aug 2018 16:14:26 +0200
+Subject: EDAC: Add missing MEM_LRDDR4 entry in edac_mem_types[]
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit b748f2de4b2f578599f46c6000683a8da755bf68 upstream.
+
+The edac_mem_types[] array misses a MEM_LRDDR4 entry, which leads to
+NULL pointer dereference when accessed via sysfs or such.
+
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
+Cc: Yazen Ghannam <Yazen.Ghannam@amd.com>
+Cc: linux-edac <linux-edac@vger.kernel.org>
+Cc: <stable@vger.kernel.org>
+Link: http://lkml.kernel.org/r/20180810141426.8918-1-tiwai@suse.de
+Fixes: 1e8096bb2031 ("EDAC: Add LRDDR4 DRAM type")
+Signed-off-by: Borislav Petkov <bp@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/edac/edac_mc.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/edac/edac_mc.c
++++ b/drivers/edac/edac_mc.c
+@@ -215,6 +215,7 @@ const char * const edac_mem_types[] = {
+       [MEM_LRDDR3]    = "Load-Reduced-DDR3-RAM",
+       [MEM_DDR4]      = "Unbuffered-DDR4",
+       [MEM_RDDR4]     = "Registered-DDR4",
++      [MEM_LRDDR4]    = "Load-Reduced-DDR4-RAM",
+       [MEM_NVDIMM]    = "Non-volatile-RAM",
+ };
+ EXPORT_SYMBOL_GPL(edac_mem_types);

diff --git a/queue-4.18/pty-fix-o_cloexec-for-tiocgptpeer.patch b/queue-4.18/pty-fix-o_cloexec-for-tiocgptpeer.patch
new file mode 100644 (file)
index 0000000..927cb6c
--- /dev/null
+++ b/queue-4.18/pty-fix-o_cloexec-for-tiocgptpeer.patch
@@ -0,0 +1,32 @@
+From 36ecc1481dc8d8c52d43ba18c6b642c1d2fde789 Mon Sep 17 00:00:00 2001
+From: Matthijs van Duin <matthijsvanduin@gmail.com>
+Date: Thu, 19 Jul 2018 10:43:46 +0200
+Subject: pty: fix O_CLOEXEC for TIOCGPTPEER
+
+From: Matthijs van Duin <matthijsvanduin@gmail.com>
+
+commit 36ecc1481dc8d8c52d43ba18c6b642c1d2fde789 upstream.
+
+It was being ignored because the flags were not passed to fd allocation.
+
+Fixes: 54ebbfb16034 ("tty: add TIOCGPTPEER ioctl")
+Signed-off-by: Matthijs van Duin <matthijsvanduin@gmail.com>
+Acked-by: Aleksa Sarai <asarai@suse.de>
+Cc: stable <stable@vger.kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/tty/pty.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/tty/pty.c
++++ b/drivers/tty/pty.c
+@@ -625,7 +625,7 @@ int ptm_open_peer(struct file *master, s
+       if (tty->driver != ptm_driver)
+               return -EIO;
+ 
+-      fd = get_unused_fd_flags(0);
++      fd = get_unused_fd_flags(flags);
+       if (fd < 0) {
+               retval = fd;
+               goto err;

diff --git a/queue-4.18/series b/queue-4.18/series
new file mode 100644 (file)
index 0000000..98dd77b
--- /dev/null
+++ b/queue-4.18/series
@@ -0,0 +1,2 @@
+edac-add-missing-mem_lrddr4-entry-in-edac_mem_types.patch
+pty-fix-o_cloexec-for-tiocgptpeer.patch