diff options
| -rw-r--r-- | 0003-USB-serial-keyspan_usa-add-proper-SPDX-lines-for-.h-.patch | 54 | ||||
| -rw-r--r-- | 0005-USB-usbip-delete-README-file.patch | 26 | ||||
| -rw-r--r-- | 0008-tty-Handle-problem-if-line-discipline-does-not-have-.patch | 29 | ||||
| -rw-r--r-- | p01 | 2 | ||||
| -rw-r--r-- | p04 | 2 | ||||
| -rw-r--r-- | p07 | 2 | ||||
| -rw-r--r-- | sctp-walk-the-list-of-asoc-safely.patch | 39 | ||||
| -rw-r--r-- | series | 4 |
8 files changed, 3 insertions, 155 deletions
diff --git a/0003-USB-serial-keyspan_usa-add-proper-SPDX-lines-for-.h-.patch b/0003-USB-serial-keyspan_usa-add-proper-SPDX-lines-for-.h-.patch deleted file mode 100644 index 3220abd303af53..00000000000000 --- a/0003-USB-serial-keyspan_usa-add-proper-SPDX-lines-for-.h-.patch +++ /dev/null @@ -1,54 +0,0 @@ -From f5fa2daf1af6367da7784f7219bb2927f6a11f26 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 17 Jan 2019 09:14:27 +0100 -Subject: [PATCH 03/11] USB: serial: keyspan_usa: add proper SPDX lines for .h - files - -The keyspan_usa??msg.h files are under a BSD-3 style license, so -properly label them as such with a SPDX line at the top of the file. - -Cc: Johan Hovold <johan@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/serial/keyspan_usa26msg.h | 1 + - drivers/usb/serial/keyspan_usa28msg.h | 1 + - drivers/usb/serial/keyspan_usa49msg.h | 1 + - drivers/usb/serial/keyspan_usa67msg.h | 1 + - drivers/usb/serial/keyspan_usa90msg.h | 1 + - 5 files changed, 5 insertions(+) - ---- a/drivers/usb/serial/keyspan_usa26msg.h -+++ b/drivers/usb/serial/keyspan_usa26msg.h -@@ -1,3 +1,4 @@ -+/* SPDX-License-Identifier: BSD-3-Clause */ - /* - usa26msg.h - ---- a/drivers/usb/serial/keyspan_usa28msg.h -+++ b/drivers/usb/serial/keyspan_usa28msg.h -@@ -1,3 +1,4 @@ -+/* SPDX-License-Identifier: BSD-3-Clause */ - /* - usa28msg.h - ---- a/drivers/usb/serial/keyspan_usa49msg.h -+++ b/drivers/usb/serial/keyspan_usa49msg.h -@@ -1,3 +1,4 @@ -+/* SPDX-License-Identifier: BSD-3-Clause */ - /* - usa49msg.h - ---- a/drivers/usb/serial/keyspan_usa67msg.h -+++ b/drivers/usb/serial/keyspan_usa67msg.h -@@ -1,3 +1,4 @@ -+/* SPDX-License-Identifier: BSD-3-Clause */ - /* - usa67msg.h - ---- a/drivers/usb/serial/keyspan_usa90msg.h -+++ b/drivers/usb/serial/keyspan_usa90msg.h -@@ -1,3 +1,4 @@ -+/* SPDX-License-Identifier: BSD-3-Clause */ - /* - usa90msg.h - diff --git a/0005-USB-usbip-delete-README-file.patch b/0005-USB-usbip-delete-README-file.patch deleted file mode 100644 index 143653d1f4b552..00000000000000 --- a/0005-USB-usbip-delete-README-file.patch +++ /dev/null @@ -1,26 +0,0 @@ -From fb31307b19e41465cd404336b03f75d1ce3b8a79 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 17 Jan 2019 09:17:03 +0100 -Subject: [PATCH 05/11] USB: usbip: delete README file - -The README file ni the drivers/usb/usbip/ directory is not needed -anymore, so just delete it. - -Cc: Valentina Manea <valentina.manea.m@gmail.com> -Cc: Shuah Khan <shuah@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/usbip/README | 7 ------- - 1 file changed, 7 deletions(-) - delete mode 100644 drivers/usb/usbip/README - ---- a/drivers/usb/usbip/README -+++ /dev/null -@@ -1,7 +0,0 @@ --TODO: -- - more discussion about the protocol -- - testing -- - review of the userspace interface -- - document the protocol -- --Please send patches for this code to Greg Kroah-Hartman <greg@kroah.com> diff --git a/0008-tty-Handle-problem-if-line-discipline-does-not-have-.patch b/0008-tty-Handle-problem-if-line-discipline-does-not-have-.patch deleted file mode 100644 index acd33e2ef78951..00000000000000 --- a/0008-tty-Handle-problem-if-line-discipline-does-not-have-.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 19e08b371b6795e009f09cdcf30f76ad0f1db037 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Sun, 20 Jan 2019 10:46:58 +0100 -Subject: [PATCH 08/11] tty: Handle problem if line discipline does not have - receive_buf - -Some tty line disciplines do not have a receive buf callback, so -properly check for that before calling it. If they do not have this -callback, just eat the character quietly, as we can't fail this call. - -Reported-by: Jann Horn <jannh@google.com> -Cc: stable <stable@vger.kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/tty/tty_io.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/drivers/tty/tty_io.c -+++ b/drivers/tty/tty_io.c -@@ -2189,7 +2189,8 @@ static int tiocsti(struct tty_struct *tt - ld = tty_ldisc_ref_wait(tty); - if (!ld) - return -EIO; -- ld->ops->receive_buf(tty, &ch, &mbz, 1); -+ if (ld->ops->receive_buf) -+ ld->ops->receive_buf(tty, &ch, &mbz, 1); - tty_ldisc_deref(ld); - return 0; - } @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #endif /* CONFIG_ARM64_PTDUMP_CORE */ --- a/arch/arm64/mm/dump.c +++ b/arch/arm64/mm/dump.c -@@ -407,7 +407,7 @@ void ptdump_check_wx(void) +@@ -406,7 +406,7 @@ void ptdump_check_wx(void) static int ptdump_init(void) { ptdump_initialize(); @@ -377,7 +377,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> /* --- a/arch/powerpc/platforms/powernv/pci-ioda.c +++ b/arch/powerpc/platforms/powernv/pci-ioda.c -@@ -3167,11 +3167,6 @@ static void pnv_pci_ioda_create_dbgfs(vo +@@ -3168,11 +3168,6 @@ static void pnv_pci_ioda_create_dbgfs(vo sprintf(name, "PCI%04x", hose->global_number); phb->dbgfs = debugfs_create_dir(name, powerpc_debugfs_root); @@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/arch/x86/kernel/cpu/mce/core.c +++ b/arch/x86/kernel/cpu/mce/core.c -@@ -2457,22 +2457,15 @@ static int fake_panic_set(void *data, u6 +@@ -2458,22 +2458,15 @@ static int fake_panic_set(void *data, u6 DEFINE_SIMPLE_ATTRIBUTE(fake_panic_fops, fake_panic_get, fake_panic_set, "%llu\n"); diff --git a/sctp-walk-the-list-of-asoc-safely.patch b/sctp-walk-the-list-of-asoc-safely.patch deleted file mode 100644 index 04b03dc760d0eb..00000000000000 --- a/sctp-walk-the-list-of-asoc-safely.patch +++ /dev/null @@ -1,39 +0,0 @@ -From foo@baz Fri Feb 1 14:09:51 CET 2019 -Date: Fri, 01 Feb 2019 14:09:51 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: sctp: walk the list of asoc safely - -In sctp_sendmesg(), when walking the list of endpoint associations, the -association can be dropped from the list, making the list corrupt. -Properly handle this by using list_for_each_entry_safe() - -Fixes: 4910280503f3 ("sctp: add support for snd flag SCTP_SENDALL process in sendmsg") -Reported-by: Secunia Research <vuln@secunia.com> -Tested-by: Secunia Research <vuln@secunia.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> - ---- - net/sctp/socket.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/net/sctp/socket.c -+++ b/net/sctp/socket.c -@@ -2027,7 +2027,7 @@ static int sctp_sendmsg(struct sock *sk, - struct sctp_endpoint *ep = sctp_sk(sk)->ep; - struct sctp_transport *transport = NULL; - struct sctp_sndrcvinfo _sinfo, *sinfo; -- struct sctp_association *asoc; -+ struct sctp_association *asoc, *tmp; - struct sctp_cmsgs cmsgs; - union sctp_addr *daddr; - bool new = false; -@@ -2053,7 +2053,7 @@ static int sctp_sendmsg(struct sock *sk, - - /* SCTP_SENDALL process */ - if ((sflags & SCTP_SENDALL) && sctp_style(sk, UDP)) { -- list_for_each_entry(asoc, &ep->asocs, asocs) { -+ list_for_each_entry_safe(asoc, tmp, &ep->asocs, asocs) { - err = sctp_sendmsg_check_sflags(asoc, sflags, msg, - msg_len); - if (err == 0) @@ -2,17 +2,13 @@ rpc-properly-check-debugfs-dentry-before-using-it.patch 0003-toneport-fixes.patch -sctp-walk-the-list-of-asoc-safely.patch stable-kernel-rules.rst-add-link-to-networking-patch-queue.patch spdxcheck-print-out-files-without-any-spdx-lines.patch 0001-Bluetooth-check-message-types-in-l2cap_get_conf_opt.patch 0002-Bluetooth-check-the-buffer-size-for-some-messages-be.patch -0003-USB-serial-keyspan_usa-add-proper-SPDX-lines-for-.h-.patch 0004-USB-host-whci-rename-Kbuild-file.patch -0005-USB-usbip-delete-README-file.patch 0006-USB-remove-README-file.patch 0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch -0008-tty-Handle-problem-if-line-discipline-does-not-have-.patch 0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch p00 p01 |