diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:20:57 +0100 |
| commit | ee9dcf22a075bce42d85b58108ca601ca434e663 (patch) | |
| tree | 3d45f9e2fe020d467fbca570d9c4d481afa190ac | |
| parent | 40c493e29885df8b9e3eaef8418af97ce8a90967 (diff) | |
| download | patches-ee9dcf22a075bce42d85b58108ca601ca434e663.tar.gz | |
update patches based on what is merged in Linus's tree
| -rw-r--r-- | 0001-Bluetooth-check-message-types-in-l2cap_get_conf_opt.patch | 95 | ||||
| -rw-r--r-- | 0002-Bluetooth-check-the-buffer-size-for-some-messages-be.patch | 60 | ||||
| -rw-r--r-- | 0004-USB-host-whci-rename-Kbuild-file.patch | 50 | ||||
| -rw-r--r-- | 0006-USB-remove-README-file.patch | 71 | ||||
| -rw-r--r-- | 0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch | 281 | ||||
| -rw-r--r-- | 0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch | 137 | ||||
| -rw-r--r-- | kvm-properly-check-debugfs-dentry-before-using-it.patch | 36 | ||||
| -rw-r--r-- | p00 | 44 | ||||
| -rw-r--r-- | p01 | 68 | ||||
| -rw-r--r-- | p03 | 300 | ||||
| -rw-r--r-- | p04 | 77 | ||||
| -rw-r--r-- | p05 | 113 | ||||
| -rw-r--r-- | p07 | 4 | ||||
| -rw-r--r-- | p12 | 2 | ||||
| -rw-r--r-- | series | 12 | ||||
| -rw-r--r-- | spdxcheck-print-out-files-without-any-spdx-lines.patch | 2 | ||||
| -rw-r--r-- | stable-kernel-rules.rst-add-link-to-networking-patch-queue.patch | 30 | ||||
| -rw-r--r-- | usb-cp210x-add-new-device-id.patch | 8 | ||||
| -rw-r--r-- | usb_DEVICE_ATTR.patch | 26 |
19 files changed, 33 insertions, 1383 deletions
diff --git a/0001-Bluetooth-check-message-types-in-l2cap_get_conf_opt.patch b/0001-Bluetooth-check-message-types-in-l2cap_get_conf_opt.patch deleted file mode 100644 index 344d40f5398508..00000000000000 --- a/0001-Bluetooth-check-message-types-in-l2cap_get_conf_opt.patch +++ /dev/null @@ -1,95 +0,0 @@ -From cfcc872e012be6c4e2bea3e70b7386176bd1a6c0 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Fri, 4 Jan 2019 10:50:37 +0100 -Subject: [PATCH 1/3] Bluetooth: check message types in l2cap_get_conf_opt - -l2cap_get_conf_opt can handle a "default" message type, but it needs to -be verified that it really is the correct type (CONF_EFS or CONF_RFC) -before passing it back to the caller. To do this we need to check the -return value of this call now and handle the error correctly up the -stack. - -Based on a patch from Ran Menscher. - -Reported-by: Ran Menscher <ran.menscher@karambasecurity.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - net/bluetooth/l2cap_core.c | 25 +++++++++++++++++++------ - 1 file changed, 19 insertions(+), 6 deletions(-) - ---- a/net/bluetooth/l2cap_core.c -+++ b/net/bluetooth/l2cap_core.c -@@ -2980,6 +2980,10 @@ static inline int l2cap_get_conf_opt(voi - break; - - default: -+ /* Only CONF_EFS and CONF_RFC are allowed here */ -+ if ((opt->type != L2CAP_CONF_EFS) && -+ (opt->type != L2CAP_CONF_RFC)) -+ return -EPROTO; - *val = (unsigned long) opt->val; - break; - } -@@ -3324,7 +3328,7 @@ static int l2cap_parse_conf_req(struct l - void *endptr = data + data_size; - void *req = chan->conf_req; - int len = chan->conf_len; -- int type, hint, olen; -+ int type, hint, olen, err; - unsigned long val; - struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC }; - struct l2cap_conf_efs efs; -@@ -3336,7 +3340,10 @@ static int l2cap_parse_conf_req(struct l - BT_DBG("chan %p", chan); - - while (len >= L2CAP_CONF_OPT_SIZE) { -- len -= l2cap_get_conf_opt(&req, &type, &olen, &val); -+ err = l2cap_get_conf_opt(&req, &type, &olen, &val); -+ if (err < 0) -+ return err; -+ len -= err; - - hint = type & L2CAP_CONF_HINT; - type &= L2CAP_CONF_MASK; -@@ -3539,7 +3546,7 @@ static int l2cap_parse_conf_rsp(struct l - struct l2cap_conf_req *req = data; - void *ptr = req->data; - void *endptr = data + size; -- int type, olen; -+ int type, olen, err; - unsigned long val; - struct l2cap_conf_rfc rfc = { .mode = L2CAP_MODE_BASIC }; - struct l2cap_conf_efs efs; -@@ -3547,7 +3554,10 @@ static int l2cap_parse_conf_rsp(struct l - BT_DBG("chan %p, rsp %p, len %d, req %p", chan, rsp, len, data); - - while (len >= L2CAP_CONF_OPT_SIZE) { -- len -= l2cap_get_conf_opt(&rsp, &type, &olen, &val); -+ err = l2cap_get_conf_opt(&rsp, &type, &olen, &val); -+ if (err < 0) -+ return err; -+ len -= err; - - switch (type) { - case L2CAP_CONF_MTU: -@@ -3707,7 +3717,7 @@ void __l2cap_connect_rsp_defer(struct l2 - - static void l2cap_conf_rfc_get(struct l2cap_chan *chan, void *rsp, int len) - { -- int type, olen; -+ int type, olen, err; - unsigned long val; - /* Use sane default values in case a misbehaving remote device - * did not send an RFC or extended window size option. -@@ -3727,7 +3737,10 @@ static void l2cap_conf_rfc_get(struct l2 - return; - - while (len >= L2CAP_CONF_OPT_SIZE) { -- len -= l2cap_get_conf_opt(&rsp, &type, &olen, &val); -+ err = l2cap_get_conf_opt(&rsp, &type, &olen, &val); -+ if (err < 0) -+ return; -+ len -= err; - - switch (type) { - case L2CAP_CONF_RFC: diff --git a/0002-Bluetooth-check-the-buffer-size-for-some-messages-be.patch b/0002-Bluetooth-check-the-buffer-size-for-some-messages-be.patch deleted file mode 100644 index 8567d4277aae9d..00000000000000 --- a/0002-Bluetooth-check-the-buffer-size-for-some-messages-be.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 6d85d9b7aad36ba344f1d4ba950ffee4f25016d0 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Fri, 4 Jan 2019 10:58:12 +0100 -Subject: [PATCH 2/3] Bluetooth: check the buffer size for some messages before - parsing - -The L2CAP_CONF_EFS and L2CAP_CONF_RFC messages can be sent from -userspace so their structure sizes need to be checked before parsing -them. - -Based on a patch from Ran Menscher. - -Reported-by: Ran Menscher <ran.menscher@karambasecurity.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - net/bluetooth/l2cap_core.c | 12 ++++++++---- - 1 file changed, 8 insertions(+), 4 deletions(-) - ---- a/net/bluetooth/l2cap_core.c -+++ b/net/bluetooth/l2cap_core.c -@@ -3361,7 +3361,8 @@ static int l2cap_parse_conf_req(struct l - break; - - case L2CAP_CONF_RFC: -- if (olen == sizeof(rfc)) -+ if ((olen == sizeof(rfc)) && -+ (endptr - ptr >= L2CAP_CONF_OPT_SIZE + sizeof(rfc))) - memcpy(&rfc, (void *) val, olen); - break; - -@@ -3371,7 +3372,8 @@ static int l2cap_parse_conf_req(struct l - break; - - case L2CAP_CONF_EFS: -- if (olen == sizeof(efs)) { -+ if ((olen == sizeof(efs)) && -+ (endptr - ptr >= L2CAP_CONF_OPT_SIZE + sizeof(efs))) { - remote_efs = 1; - memcpy(&efs, (void *) val, olen); - } -@@ -3576,7 +3578,8 @@ static int l2cap_parse_conf_rsp(struct l - break; - - case L2CAP_CONF_RFC: -- if (olen == sizeof(rfc)) -+ if ((olen == sizeof(rfc)) && -+ (endptr - ptr >= L2CAP_CONF_OPT_SIZE + sizeof(rfc))) - memcpy(&rfc, (void *)val, olen); - - if (test_bit(CONF_STATE2_DEVICE, &chan->conf_state) && -@@ -3596,7 +3599,8 @@ static int l2cap_parse_conf_rsp(struct l - break; - - case L2CAP_CONF_EFS: -- if (olen == sizeof(efs)) { -+ if ((olen == sizeof(efs)) && -+ (endptr - ptr >= L2CAP_CONF_OPT_SIZE + sizeof(efs))) { - memcpy(&efs, (void *)val, olen); - - if (chan->local_stype != L2CAP_SERV_NOTRAFIC && diff --git a/0004-USB-host-whci-rename-Kbuild-file.patch b/0004-USB-host-whci-rename-Kbuild-file.patch deleted file mode 100644 index bf0024bb05e5a0..00000000000000 --- a/0004-USB-host-whci-rename-Kbuild-file.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 23443c60aeff81e10c788ab8e07bbe83189a2a33 Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 17 Jan 2019 09:16:00 +0100 -Subject: [PATCH 04/11] USB: host: whci: rename Kbuild file - -We have been using Makefile for well over a decade now, use that name -instead of Kbuild. - -Also, while moving the file, add the proper SPDX identifier at the top -of it. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/host/whci/Kbuild | 12 ------------ - drivers/usb/host/whci/Makefile | 14 ++++++++++++++ - 2 files changed, 14 insertions(+), 12 deletions(-) - rename drivers/usb/host/whci/{Kbuild => Makefile} (79%) - ---- a/drivers/usb/host/whci/Kbuild -+++ /dev/null -@@ -1,12 +0,0 @@ --obj-$(CONFIG_USB_WHCI_HCD) += whci-hcd.o -- --whci-hcd-y := \ -- asl.o \ -- debug.o \ -- hcd.o \ -- hw.o \ -- init.o \ -- int.o \ -- pzl.o \ -- qset.o \ -- wusb.o ---- /dev/null -+++ b/drivers/usb/host/whci/Makefile -@@ -0,0 +1,14 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ -+obj-$(CONFIG_USB_WHCI_HCD) += whci-hcd.o -+ -+whci-hcd-y := \ -+ asl.o \ -+ debug.o \ -+ hcd.o \ -+ hw.o \ -+ init.o \ -+ int.o \ -+ pzl.o \ -+ qset.o \ -+ wusb.o diff --git a/0006-USB-remove-README-file.patch b/0006-USB-remove-README-file.patch deleted file mode 100644 index a5586784302a7c..00000000000000 --- a/0006-USB-remove-README-file.patch +++ /dev/null @@ -1,71 +0,0 @@ -From 02f6a3c9cceaa28eb4c05bcc3c40d1653de1a93c Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 17 Jan 2019 09:17:39 +0100 -Subject: [PATCH 06/11] USB: remove README file - -This file is really really old, and doesn't make any sense to keep -around anymore, so just drop it. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/README | 54 ----------------------------------------------------- - 1 file changed, 54 deletions(-) - delete mode 100644 drivers/usb/README - ---- a/drivers/usb/README -+++ /dev/null -@@ -1,54 +0,0 @@ --To understand all the Linux-USB framework, you'll use these resources: -- -- * This source code. This is necessarily an evolving work, and -- includes kerneldoc that should help you get a current overview. -- ("make pdfdocs", and then look at "usb.pdf" for host side and -- "gadget.pdf" for peripheral side.) Also, Documentation/usb has -- more information. -- -- * The USB 2.0 specification (from www.usb.org), with supplements -- such as those for USB OTG and the various device classes. -- The USB specification has a good overview chapter, and USB -- peripherals conform to the widely known "Chapter 9". -- -- * Chip specifications for USB controllers. Examples include -- host controllers (on PCs, servers, and more); peripheral -- controllers (in devices with Linux firmware, like printers or -- cell phones); and hard-wired peripherals like Ethernet adapters. -- -- * Specifications for other protocols implemented by USB peripheral -- functions. Some are vendor-specific; others are vendor-neutral -- but just standardized outside of the www.usb.org team. -- --Here is a list of what each subdirectory here is, and what is contained in --them. -- --core/ - This is for the core USB host code, including the -- usbfs files and the hub class driver ("hub_wq"). -- --host/ - This is for USB host controller drivers. This -- includes UHCI, OHCI, EHCI, and others that might -- be used with more specialized "embedded" systems. -- --gadget/ - This is for USB peripheral controller drivers and -- the various gadget drivers which talk to them. -- -- --Individual USB driver directories. A new driver should be added to the --first subdirectory in the list below that it fits into. -- --image/ - This is for still image drivers, like scanners or -- digital cameras. --../input/ - This is for any driver that uses the input subsystem, -- like keyboard, mice, touchscreens, tablets, etc. --../media/ - This is for multimedia drivers, like video cameras, -- radios, and any other drivers that talk to the v4l -- subsystem. --../net/ - This is for network drivers. --serial/ - This is for USB to serial drivers. --storage/ - This is for USB mass-storage drivers. --class/ - This is for all USB device drivers that do not fit -- into any of the above categories, and work for a range -- of USB Class specified devices. --misc/ - This is for all USB device drivers that do not fit -- into any of the above categories. diff --git a/0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch b/0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch deleted file mode 100644 index d403f0b57d45f3..00000000000000 --- a/0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch +++ /dev/null @@ -1,281 +0,0 @@ -From 51da7f15581cc270c2dba8c9d668c084b21f57bc Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Thu, 17 Jan 2019 09:18:29 +0100 -Subject: [PATCH 07/11] USB: add missing SPDX lines to Kconfig and Makefiles - -There are a few remaining drivers/usb/ files that do not have SPDX -identifiers in them, all of these are either Kconfig or Makefiles. Add -the correct GPL-2.0 identifier to them to make scanning tools happy. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/usb/Kconfig | 1 + - drivers/usb/atm/Kconfig | 1 + - drivers/usb/chipidea/Kconfig | 2 ++ - drivers/usb/class/Kconfig | 1 + - drivers/usb/core/Kconfig | 1 + - drivers/usb/dwc2/Kconfig | 2 ++ - drivers/usb/dwc3/Kconfig | 2 ++ - drivers/usb/gadget/Kconfig | 1 + - drivers/usb/gadget/legacy/Kconfig | 1 + - drivers/usb/gadget/udc/Kconfig | 1 + - drivers/usb/gadget/udc/bdc/Kconfig | 2 ++ - drivers/usb/host/Kconfig | 1 + - drivers/usb/image/Kconfig | 1 + - drivers/usb/isp1760/Kconfig | 2 ++ - drivers/usb/misc/Kconfig | 1 + - drivers/usb/misc/sisusbvga/Kconfig | 1 + - drivers/usb/mon/Kconfig | 1 + - drivers/usb/mtu3/Kconfig | 2 ++ - drivers/usb/musb/Kconfig | 1 + - drivers/usb/phy/Kconfig | 1 + - drivers/usb/roles/Kconfig | 2 ++ - drivers/usb/roles/Makefile | 2 ++ - drivers/usb/serial/Kconfig | 1 + - drivers/usb/storage/Kconfig | 1 + - drivers/usb/typec/Kconfig | 1 + - drivers/usb/typec/altmodes/Kconfig | 1 + - drivers/usb/typec/altmodes/Makefile | 2 ++ - drivers/usb/typec/mux/Kconfig | 2 ++ - drivers/usb/typec/tcpm/Kconfig | 2 ++ - drivers/usb/typec/ucsi/Kconfig | 2 ++ - drivers/usb/usbip/Kconfig | 2 ++ - drivers/usb/wusbcore/Kconfig | 1 + - 32 files changed, 45 insertions(+) - ---- a/drivers/usb/Kconfig -+++ b/drivers/usb/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB device configuration - # ---- a/drivers/usb/atm/Kconfig -+++ b/drivers/usb/atm/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB/ATM DSL configuration - # ---- a/drivers/usb/chipidea/Kconfig -+++ b/drivers/usb/chipidea/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_CHIPIDEA - tristate "ChipIdea Highspeed Dual Role Controller" - depends on ((USB_EHCI_HCD && USB_GADGET) || (USB_EHCI_HCD && !USB_GADGET) || (!USB_EHCI_HCD && USB_GADGET)) && HAS_DMA ---- a/drivers/usb/class/Kconfig -+++ b/drivers/usb/class/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Class driver configuration - # ---- a/drivers/usb/core/Kconfig -+++ b/drivers/usb/core/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Core configuration - # ---- a/drivers/usb/dwc2/Kconfig -+++ b/drivers/usb/dwc2/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_DWC2 - tristate "DesignWare USB2 DRD Core Support" - depends on HAS_DMA ---- a/drivers/usb/dwc3/Kconfig -+++ b/drivers/usb/dwc3/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_DWC3 - tristate "DesignWare USB3 DRD Core Support" - depends on (USB || USB_GADGET) && HAS_DMA ---- a/drivers/usb/gadget/Kconfig -+++ b/drivers/usb/gadget/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Gadget support on a system involves - # (a) a peripheral controller, and ---- a/drivers/usb/gadget/legacy/Kconfig -+++ b/drivers/usb/gadget/legacy/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Gadget support on a system involves - # (a) a peripheral controller, and ---- a/drivers/usb/gadget/udc/Kconfig -+++ b/drivers/usb/gadget/udc/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Gadget support on a system involves - # (a) a peripheral controller, and ---- a/drivers/usb/gadget/udc/bdc/Kconfig -+++ b/drivers/usb/gadget/udc/bdc/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_BDC_UDC - tristate "Broadcom USB3.0 device controller IP driver(BDC)" - depends on USB_GADGET && HAS_DMA ---- a/drivers/usb/host/Kconfig -+++ b/drivers/usb/host/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Host Controller Drivers - # ---- a/drivers/usb/image/Kconfig -+++ b/drivers/usb/image/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Imaging devices configuration - # ---- a/drivers/usb/isp1760/Kconfig -+++ b/drivers/usb/isp1760/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_ISP1760 - tristate "NXP ISP 1760/1761 support" - depends on USB || USB_GADGET ---- a/drivers/usb/misc/Kconfig -+++ b/drivers/usb/misc/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Miscellaneous driver configuration - # ---- a/drivers/usb/misc/sisusbvga/Kconfig -+++ b/drivers/usb/misc/sisusbvga/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - - config USB_SISUSBVGA - tristate "USB 2.0 SVGA dongle support (Net2280/SiS315)" ---- a/drivers/usb/mon/Kconfig -+++ b/drivers/usb/mon/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Monitor configuration - # ---- a/drivers/usb/mtu3/Kconfig -+++ b/drivers/usb/mtu3/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+# - # For MTK USB3.0 IP - - config USB_MTU3 ---- a/drivers/usb/musb/Kconfig -+++ b/drivers/usb/musb/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Dual Role (OTG-ready) Controller Drivers - # for silicon based on Mentor Graphics INVENTRA designs ---- a/drivers/usb/phy/Kconfig -+++ b/drivers/usb/phy/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # Physical Layer USB driver configuration - # ---- a/drivers/usb/roles/Kconfig -+++ b/drivers/usb/roles/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USB_ROLE_SWITCH - tristate "USB Role Switch Support" - help ---- a/drivers/usb/roles/Makefile -+++ b/drivers/usb/roles/Makefile -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - obj-$(CONFIG_USB_ROLE_SWITCH) += roles.o - roles-y := class.o - obj-$(CONFIG_USB_ROLES_INTEL_XHCI) += intel-xhci-usb-role-switch.o ---- a/drivers/usb/serial/Kconfig -+++ b/drivers/usb/serial/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Serial device configuration - # ---- a/drivers/usb/storage/Kconfig -+++ b/drivers/usb/storage/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # USB Storage driver configuration - # ---- a/drivers/usb/typec/Kconfig -+++ b/drivers/usb/typec/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - - menuconfig TYPEC - tristate "USB Type-C Support" ---- a/drivers/usb/typec/altmodes/Kconfig -+++ b/drivers/usb/typec/altmodes/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - - menu "USB Type-C Alternate Mode drivers" - ---- a/drivers/usb/typec/altmodes/Makefile -+++ b/drivers/usb/typec/altmodes/Makefile -@@ -1,2 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - obj-$(CONFIG_TYPEC_DP_ALTMODE) += typec_displayport.o - typec_displayport-y := displayport.o ---- a/drivers/usb/typec/mux/Kconfig -+++ b/drivers/usb/typec/mux/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - menu "USB Type-C Multiplexer/DeMultiplexer Switch support" - - config TYPEC_MUX_PI3USB30532 ---- a/drivers/usb/typec/tcpm/Kconfig -+++ b/drivers/usb/typec/tcpm/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config TYPEC_TCPM - tristate "USB Type-C Port Controller Manager" - depends on USB ---- a/drivers/usb/typec/ucsi/Kconfig -+++ b/drivers/usb/typec/ucsi/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config TYPEC_UCSI - tristate "USB Type-C Connector System Software Interface driver" - depends on !CPU_BIG_ENDIAN ---- a/drivers/usb/usbip/Kconfig -+++ b/drivers/usb/usbip/Kconfig -@@ -1,3 +1,5 @@ -+# SPDX-License-Identifier: GPL-2.0 -+ - config USBIP_CORE - tristate "USB/IP support" - depends on NET ---- a/drivers/usb/wusbcore/Kconfig -+++ b/drivers/usb/wusbcore/Kconfig -@@ -1,3 +1,4 @@ -+# SPDX-License-Identifier: GPL-2.0 - # - # Wireless USB Core configuration - # diff --git a/0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch b/0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch deleted file mode 100644 index e5039346d971e6..00000000000000 --- a/0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch +++ /dev/null @@ -1,137 +0,0 @@ -From 813613139b98f5c811441d1292ffd1760b55defa Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Mon, 21 Jan 2019 09:45:58 +0100 -Subject: [PATCH 09/11] tty: ldisc: add sysctl to prevent autoloading of ldiscs - -By default, the kernel will automatically load the module of any line -dicipline that is asked for. As this sometimes isn't the safest thing -to do, provide a sysctl to disable this feature. - -By default, we set this to 'y' as that is the historical way that Linux -has worked, and we do not want to break working systems. But in the -future, perhaps this can default to 'n' to prevent this functionality. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - drivers/tty/Kconfig | 24 ++++++++++++++++++++++++ - drivers/tty/tty_io.c | 3 +++ - drivers/tty/tty_ldisc.c | 47 +++++++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 74 insertions(+) - ---- a/drivers/tty/Kconfig -+++ b/drivers/tty/Kconfig -@@ -441,4 +441,28 @@ config VCC - depends on SUN_LDOMS - help - Support for Sun logical domain consoles. -+ -+config LDISC_AUTOLOAD -+ bool "Automatically load TTY Line Disciplines" -+ default y -+ help -+ Historically the kernel has always automatically loaded any -+ line discipline that is in a kernel module when a user asks -+ for it to be loaded with the TIOCSETD ioctl, or through other -+ means. This is not always the best thing to do on systems -+ where you know you will not be using some of the more -+ "ancient" line disciplines, so prevent the kernel from doing -+ this unless the request is coming from a process with the -+ CAP_SYS_MODULE permissions. -+ -+ Say 'Y' here if you trust your userspace users to do the right -+ thing, or if you have only provided the line disciplines that -+ you know you will be using, or if you wish to continue to use -+ the traditional method of on-demand loading of these modules -+ by any user. -+ -+ This functionality can be changed at runtime with the -+ dev.tty.ldisc_autoload sysctl, this configuration option will -+ only set the default value of this functionality. -+ - endif # TTY ---- a/drivers/tty/tty_io.c -+++ b/drivers/tty/tty_io.c -@@ -513,6 +513,8 @@ static const struct file_operations hung - static DEFINE_SPINLOCK(redirect_lock); - static struct file *redirect; - -+extern void tty_sysctl_init(void); -+ - /** - * tty_wakeup - request more data - * @tty: terminal -@@ -3483,6 +3485,7 @@ void console_sysfs_notify(void) - */ - int __init tty_init(void) - { -+ tty_sysctl_init(); - cdev_init(&tty_cdev, &tty_fops); - if (cdev_add(&tty_cdev, MKDEV(TTYAUX_MAJOR, 0), 1) || - register_chrdev_region(MKDEV(TTYAUX_MAJOR, 0), 1, "/dev/tty") < 0) ---- a/drivers/tty/tty_ldisc.c -+++ b/drivers/tty/tty_ldisc.c -@@ -156,6 +156,13 @@ static void put_ldops(struct tty_ldisc_o - * takes tty_ldiscs_lock to guard against ldisc races - */ - -+#if defined(CONFIG_LDISC_AUTOLOAD) -+ #define INITIAL_AUTOLOAD_STATE 1 -+#else -+ #define INITIAL_AUTOLOAD_STATE 0 -+#endif -+static int tty_ldisc_autoload = INITIAL_AUTOLOAD_STATE; -+ - static struct tty_ldisc *tty_ldisc_get(struct tty_struct *tty, int disc) - { - struct tty_ldisc *ld; -@@ -170,6 +177,8 @@ static struct tty_ldisc *tty_ldisc_get(s - */ - ldops = get_ldops(disc); - if (IS_ERR(ldops)) { -+ if (!capable(CAP_SYS_MODULE) && !tty_ldisc_autoload) -+ return ERR_PTR(-EPERM); - request_module("tty-ldisc-%d", disc); - ldops = get_ldops(disc); - if (IS_ERR(ldops)) -@@ -845,3 +854,41 @@ void tty_ldisc_deinit(struct tty_struct - tty_ldisc_put(tty->ldisc); - tty->ldisc = NULL; - } -+ -+static int zero; -+static int one = 1; -+static struct ctl_table tty_table[] = { -+ { -+ .procname = "ldisc_autoload", -+ .data = &tty_ldisc_autoload, -+ .maxlen = sizeof(tty_ldisc_autoload), -+ .mode = 0644, -+ .proc_handler = proc_dointvec, -+ .extra1 = &zero, -+ .extra2 = &one, -+ }, -+ { } -+}; -+ -+static struct ctl_table tty_dir_table[] = { -+ { -+ .procname = "tty", -+ .mode = 0555, -+ .child = tty_table, -+ }, -+ { } -+}; -+ -+static struct ctl_table tty_root_table[] = { -+ { -+ .procname = "dev", -+ .mode = 0555, -+ .child = tty_dir_table, -+ }, -+ { } -+}; -+ -+void tty_sysctl_init(void) -+{ -+ register_sysctl_table(tty_root_table); -+} diff --git a/kvm-properly-check-debugfs-dentry-before-using-it.patch b/kvm-properly-check-debugfs-dentry-before-using-it.patch deleted file mode 100644 index 419de3dd9baaab..00000000000000 --- a/kvm-properly-check-debugfs-dentry-before-using-it.patch +++ /dev/null @@ -1,36 +0,0 @@ -From foo@baz Thu Feb 28 16:02:54 CET 2019 -Date: Thu, 28 Feb 2019 16:02:54 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [PATCH] kvm: properly check debugfs dentry before using it - -debugfs can now report an error code if something went wrong instead of -just NULL. So if the return value is to be used as a "real" dentry, it -needs to be checked if it is an error before dereferencing it. - -This is now happening because of ff9fb72bc077 ("debugfs: return error -values, not NULL"). syzbot has found a way to trigger multiple debugfs -files attempting to be created, which fails, and then the error code -gets passed to dentry_path_raw() which obviously does not like it. - -Reported-by: Eric Biggers <ebiggers@kernel.org> -Reported-and-tested-by: syzbot+7857962b4d45e602b8ad@syzkaller.appspotmail.com -Cc: "Radim Krčmář" <rkrcmar@redhat.com> -Cc: kvm@vger.kernel.org -Acked-by: Paolo Bonzini <pbonzini@redhat.com> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - virt/kvm/kvm_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/virt/kvm/kvm_main.c -+++ b/virt/kvm/kvm_main.c -@@ -4044,7 +4044,7 @@ static void kvm_uevent_notify_change(uns - } - add_uevent_var(env, "PID=%d", kvm->userspace_pid); - -- if (kvm->debugfs_dentry) { -+ if (!IS_ERR_OR_NULL(kvm->debugfs_dentry)) { - char *tmp, *p = kmalloc(PATH_MAX, GFP_KERNEL); - - if (p) { diff --git a/p00 b/p00 deleted file mode 100644 index bb502ad76b9076..00000000000000 --- a/p00 +++ /dev/null @@ -1,44 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] microblaze: no need to check return value of debugfs_create functions - -When calling debugfs functions, there is no need to ever check the -return value. The function can work or not, but the code logic should -never do something different based on this. - -Cc: Michal Simek <monstr@monstr.eu> -Cc: Rob Herring <robh@kernel.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/microblaze/kernel/setup.c | 13 ++----------- - 1 file changed, 2 insertions(+), 11 deletions(-) - ---- a/arch/microblaze/kernel/setup.c -+++ b/arch/microblaze/kernel/setup.c -@@ -192,23 +192,14 @@ struct dentry *of_debugfs_root; - static int microblaze_debugfs_init(void) - { - of_debugfs_root = debugfs_create_dir("microblaze", NULL); -- -- return of_debugfs_root == NULL; -+ return 0; - } - arch_initcall(microblaze_debugfs_init); - - # ifdef CONFIG_MMU - static int __init debugfs_tlb(void) - { -- struct dentry *d; -- -- if (!of_debugfs_root) -- return -ENODEV; -- -- d = debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip); -- if (!d) -- return -ENOMEM; -- -+ debugfs_create_u32("tlb_skip", S_IRUGO, of_debugfs_root, &tlb_skip); - return 0; - } - device_initcall(debugfs_tlb); diff --git a/p01 b/p01 deleted file mode 100644 index 3fa5139a1b26f4..00000000000000 --- a/p01 +++ /dev/null @@ -1,68 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] arm64: no need to check return value of debugfs_create functions - -When calling debugfs functions, there is no need to ever check the -return value. The function can work or not, but the code logic should -never do something different based on this. - -Cc: Catalin Marinas <catalin.marinas@arm.com> -Cc: Will Deacon <will.deacon@arm.com> -Cc: Marc Zyngier <marc.zyngier@arm.com> -Cc: Peng Donglin <dolinux.peng@gmail.com> -Cc: <linux-arm-kernel@lists.infradead.org> -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/arm64/include/asm/ptdump.h | 9 +++------ - arch/arm64/mm/dump.c | 4 ++-- - arch/arm64/mm/ptdump_debugfs.c | 7 ++----- - 3 files changed, 7 insertions(+), 13 deletions(-) - - ---- a/arch/arm64/include/asm/ptdump.h -+++ b/arch/arm64/include/asm/ptdump.h -@@ -34,13 +34,10 @@ struct ptdump_info { - - void ptdump_walk_pgd(struct seq_file *s, struct ptdump_info *info); - #ifdef CONFIG_ARM64_PTDUMP_DEBUGFS --int ptdump_debugfs_register(struct ptdump_info *info, const char *name); -+void ptdump_debugfs_register(struct ptdump_info *info, const char *name); - #else --static inline int ptdump_debugfs_register(struct ptdump_info *info, -- const char *name) --{ -- return 0; --} -+static inline void ptdump_debugfs_register(struct ptdump_info *info, -+ const char *name) { } - #endif - void ptdump_check_wx(void); - #endif /* CONFIG_ARM64_PTDUMP_CORE */ ---- a/arch/arm64/mm/dump.c -+++ b/arch/arm64/mm/dump.c -@@ -406,7 +406,7 @@ void ptdump_check_wx(void) - static int ptdump_init(void) - { - ptdump_initialize(); -- return ptdump_debugfs_register(&kernel_ptdump_info, -- "kernel_page_tables"); -+ ptdump_debugfs_register(&kernel_ptdump_info, "kernel_page_tables"); -+ return 0; - } - device_initcall(ptdump_init); ---- a/arch/arm64/mm/ptdump_debugfs.c -+++ b/arch/arm64/mm/ptdump_debugfs.c -@@ -12,10 +12,7 @@ static int ptdump_show(struct seq_file * - } - DEFINE_SHOW_ATTRIBUTE(ptdump); - --int ptdump_debugfs_register(struct ptdump_info *info, const char *name) -+void ptdump_debugfs_register(struct ptdump_info *info, const char *name) - { -- struct dentry *pe; -- pe = debugfs_create_file(name, 0400, NULL, info, &ptdump_fops); -- return pe ? 0 : -ENOMEM; -- -+ debugfs_create_file(name, 0400, NULL, info, &ptdump_fops); - } diff --git a/p03 b/p03 deleted file mode 100644 index 269a47e100063e..00000000000000 --- a/p03 +++ /dev/null @@ -1,300 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] mips: no need to check return value of debugfs_create functions - -When calling debugfs functions, there is no need to ever check the -return value. The function can work or not, but the code logic should -never do something different based on this. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/mips/cavium-octeon/oct_ilm.c | 31 ++++--------------------------- - arch/mips/kernel/mips-r2-to-r6-emul.c | 21 ++++----------------- - arch/mips/kernel/segment.c | 15 +++------------ - arch/mips/kernel/setup.c | 7 +------ - arch/mips/kernel/spinlock_test.c | 21 ++++----------------- - arch/mips/kernel/unaligned.c | 16 ++++------------ - arch/mips/math-emu/me-debugfs.c | 23 ++++------------------- - arch/mips/mm/sc-debugfs.c | 15 +++------------ - arch/mips/ralink/bootrom.c | 8 +------- - 9 files changed, 28 insertions(+), 129 deletions(-) - ---- a/arch/mips/cavium-octeon/oct_ilm.c -+++ b/arch/mips/cavium-octeon/oct_ilm.c -@@ -63,31 +63,12 @@ static int reset_statistics(void *data, - - DEFINE_SIMPLE_ATTRIBUTE(reset_statistics_ops, NULL, reset_statistics, "%llu\n"); - --static int init_debufs(void) -+static void init_debugfs(void) - { -- struct dentry *show_dentry; - dir = debugfs_create_dir("oct_ilm", 0); -- if (!dir) { -- pr_err("oct_ilm: failed to create debugfs entry oct_ilm\n"); -- return -1; -- } -- -- show_dentry = debugfs_create_file("statistics", 0222, dir, NULL, -- &oct_ilm_ops); -- if (!show_dentry) { -- pr_err("oct_ilm: failed to create debugfs entry oct_ilm/statistics\n"); -- return -1; -- } -- -- show_dentry = debugfs_create_file("reset", 0222, dir, NULL, -- &reset_statistics_ops); -- if (!show_dentry) { -- pr_err("oct_ilm: failed to create debugfs entry oct_ilm/reset\n"); -- return -1; -- } -- -+ debugfs_create_file("statistics", 0222, dir, NULL, &oct_ilm_ops); -+ debugfs_create_file("reset", 0222, dir, NULL, &reset_statistics_ops); - return 0; -- - } - - static void init_latency_info(struct latency_info *li, int startup) -@@ -169,11 +150,7 @@ static __init int oct_ilm_module_init(vo - int rc; - int irq = OCTEON_IRQ_TIMER0 + TIMER_NUM; - -- rc = init_debufs(); -- if (rc) { -- WARN(1, "Could not create debugfs entries"); -- return rc; -- } -+ init_debugfs(); - - rc = request_irq(irq, cvm_oct_ciu_timer_interrupt, IRQF_NO_THREAD, - "oct_ilm", 0); ---- a/arch/mips/kernel/mips-r2-to-r6-emul.c -+++ b/arch/mips/kernel/mips-r2-to-r6-emul.c -@@ -2351,23 +2351,10 @@ DEFINE_SHOW_ATTRIBUTE(mipsr2_clear); - - static int __init mipsr2_init_debugfs(void) - { -- struct dentry *mipsr2_emul; -- -- if (!mips_debugfs_dir) -- return -ENODEV; -- -- mipsr2_emul = debugfs_create_file("r2_emul_stats", S_IRUGO, -- mips_debugfs_dir, NULL, -- &mipsr2_emul_fops); -- if (!mipsr2_emul) -- return -ENOMEM; -- -- mipsr2_emul = debugfs_create_file("r2_emul_stats_clear", S_IRUGO, -- mips_debugfs_dir, NULL, -- &mipsr2_clear_fops); -- if (!mipsr2_emul) -- return -ENOMEM; -- -+ debugfs_create_file("r2_emul_stats", S_IRUGO, mips_debugfs_dir, NULL, -+ &mipsr2_emul_fops); -+ debugfs_create_file("r2_emul_stats_clear", S_IRUGO, mips_debugfs_dir, -+ NULL, &mipsr2_clear_fops); - return 0; - } - ---- a/arch/mips/kernel/segment.c -+++ b/arch/mips/kernel/segment.c -@@ -95,18 +95,9 @@ static const struct file_operations segm - - static int __init segments_info(void) - { -- struct dentry *segments; -- -- if (cpu_has_segments) { -- if (!mips_debugfs_dir) -- return -ENODEV; -- -- segments = debugfs_create_file("segments", S_IRUGO, -- mips_debugfs_dir, NULL, -- &segments_fops); -- if (!segments) -- return -ENOMEM; -- } -+ if (cpu_has_segments) -+ debugfs_create_file("segments", S_IRUGO, mips_debugfs_dir, NULL, -+ &segments_fops); - return 0; - } - ---- a/arch/mips/kernel/setup.c -+++ b/arch/mips/kernel/setup.c -@@ -1010,12 +1010,7 @@ unsigned long fw_passed_dtb; - struct dentry *mips_debugfs_dir; - static int __init debugfs_mips(void) - { -- struct dentry *d; -- -- d = debugfs_create_dir("mips", NULL); -- if (!d) -- return -ENOMEM; -- mips_debugfs_dir = d; -+ mips_debugfs_dir = debugfs_create_dir("mips", NULL); - return 0; - } - arch_initcall(debugfs_mips); ---- a/arch/mips/kernel/spinlock_test.c -+++ b/arch/mips/kernel/spinlock_test.c -@@ -118,23 +118,10 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_multi, mult - - static int __init spinlock_test(void) - { -- struct dentry *d; -- -- if (!mips_debugfs_dir) -- return -ENODEV; -- -- d = debugfs_create_file("spin_single", S_IRUGO, -- mips_debugfs_dir, NULL, -- &fops_ss); -- if (!d) -- return -ENOMEM; -- -- d = debugfs_create_file("spin_multi", S_IRUGO, -- mips_debugfs_dir, NULL, -- &fops_multi); -- if (!d) -- return -ENOMEM; -- -+ debugfs_create_file("spin_single", S_IRUGO, mips_debugfs_dir, NULL, -+ &fops_ss); -+ debugfs_create_file("spin_multi", S_IRUGO, mips_debugfs_dir, NULL, -+ &fops_multi); - return 0; - } - device_initcall(spinlock_test); ---- a/arch/mips/kernel/unaligned.c -+++ b/arch/mips/kernel/unaligned.c -@@ -2374,18 +2374,10 @@ sigbus: - #ifdef CONFIG_DEBUG_FS - static int __init debugfs_unaligned(void) - { -- struct dentry *d; -- -- if (!mips_debugfs_dir) -- return -ENODEV; -- d = debugfs_create_u32("unaligned_instructions", S_IRUGO, -- mips_debugfs_dir, &unaligned_instructions); -- if (!d) -- return -ENOMEM; -- d = debugfs_create_u32("unaligned_action", S_IRUGO | S_IWUSR, -- mips_debugfs_dir, &unaligned_action); -- if (!d) -- return -ENOMEM; -+ debugfs_create_u32("unaligned_instructions", S_IRUGO, mips_debugfs_dir, -+ &unaligned_instructions); -+ debugfs_create_u32("unaligned_action", S_IRUGO | S_IWUSR, -+ mips_debugfs_dir, &unaligned_action); - return 0; - } - arch_initcall(debugfs_unaligned); ---- a/arch/mips/math-emu/me-debugfs.c -+++ b/arch/mips/math-emu/me-debugfs.c -@@ -189,32 +189,21 @@ static int __init debugfs_fpuemu(void) - { - struct dentry *fpuemu_debugfs_base_dir; - struct dentry *fpuemu_debugfs_inst_dir; -- struct dentry *d, *reset_file; -- -- if (!mips_debugfs_dir) -- return -ENODEV; - - fpuemu_debugfs_base_dir = debugfs_create_dir("fpuemustats", - mips_debugfs_dir); -- if (!fpuemu_debugfs_base_dir) -- return -ENOMEM; - -- reset_file = debugfs_create_file("fpuemustats_clear", 0444, -- mips_debugfs_dir, NULL, -- &fpuemustats_clear_fops); -- if (!reset_file) -- return -ENOMEM; -+ debugfs_create_file("fpuemustats_clear", 0444, mips_debugfs_dir, NULL, -+ &fpuemustats_clear_fops); - - #define FPU_EMU_STAT_OFFSET(m) \ - offsetof(struct mips_fpu_emulator_stats, m) - - #define FPU_STAT_CREATE(m) \ - do { \ -- d = debugfs_create_file(#m, 0444, fpuemu_debugfs_base_dir, \ -+ debugfs_create_file(#m, 0444, fpuemu_debugfs_base_dir, \ - (void *)FPU_EMU_STAT_OFFSET(m), \ - &fops_fpuemu_stat); \ -- if (!d) \ -- return -ENOMEM; \ - } while (0) - - FPU_STAT_CREATE(emulated); -@@ -233,8 +222,6 @@ do { \ - - fpuemu_debugfs_inst_dir = debugfs_create_dir("instructions", - fpuemu_debugfs_base_dir); -- if (!fpuemu_debugfs_inst_dir) -- return -ENOMEM; - - #define FPU_STAT_CREATE_EX(m) \ - do { \ -@@ -242,11 +229,9 @@ do { \ - \ - adjust_instruction_counter_name(name, #m); \ - \ -- d = debugfs_create_file(name, 0444, fpuemu_debugfs_inst_dir, \ -+ debugfs_create_file(name, 0444, fpuemu_debugfs_inst_dir, \ - (void *)FPU_EMU_STAT_OFFSET(m), \ - &fops_fpuemu_stat); \ -- if (!d) \ -- return -ENOMEM; \ - } while (0) - - FPU_STAT_CREATE_EX(abs_s); ---- a/arch/mips/mm/sc-debugfs.c -+++ b/arch/mips/mm/sc-debugfs.c -@@ -55,20 +55,11 @@ static const struct file_operations sc_p - - static int __init sc_debugfs_init(void) - { -- struct dentry *dir, *file; -- -- if (!mips_debugfs_dir) -- return -ENODEV; -+ struct dentry *dir; - - dir = debugfs_create_dir("l2cache", mips_debugfs_dir); -- if (IS_ERR(dir)) -- return PTR_ERR(dir); -- -- file = debugfs_create_file("prefetch", S_IRUGO | S_IWUSR, dir, -- NULL, &sc_prefetch_fops); -- if (!file) -- return -ENOMEM; -- -+ debugfs_create_file("prefetch", S_IRUGO | S_IWUSR, dir, NULL, -+ &sc_prefetch_fops); - return 0; - } - late_initcall(sc_debugfs_init); ---- a/arch/mips/ralink/bootrom.c -+++ b/arch/mips/ralink/bootrom.c -@@ -35,13 +35,7 @@ static const struct file_operations boot - - static int bootrom_setup(void) - { -- if (!debugfs_create_file("bootrom", 0444, -- NULL, NULL, &bootrom_file_ops)) { -- pr_err("Failed to create bootrom debugfs file\n"); -- -- return -EINVAL; -- } -- -+ debugfs_create_file("bootrom", 0444, NULL, NULL, &bootrom_file_ops); - return 0; - } - @@ -17,9 +17,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/powerpc/kvm/book3s_64_mmu_radix.c | 5 +-- arch/powerpc/kvm/book3s_hv.c | 9 +----- arch/powerpc/kvm/timing.c | 11 +------- - arch/powerpc/mm/dump_hashpagetable.c | 7 +---- - arch/powerpc/mm/dump_linuxpagetables.c | 8 ++--- - arch/powerpc/mm/hash_utils_64.c | 7 +---- arch/powerpc/platforms/4xx/ocm.c | 14 +--------- arch/powerpc/platforms/cell/axon_msi.c | 6 ---- arch/powerpc/platforms/powernv/memtrace.c | 7 ----- @@ -29,11 +26,11 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> arch/powerpc/platforms/pseries/dtl.c | 36 +++----------------------- arch/powerpc/platforms/pseries/hvCall_inst.c | 12 ++------ arch/powerpc/sysdev/scom.c | 8 ----- - 20 files changed, 45 insertions(+), 202 deletions(-) + 17 files changed, 38 insertions(+), 187 deletions(-) --- a/arch/powerpc/include/asm/kvm_host.h +++ b/arch/powerpc/include/asm/kvm_host.h -@@ -293,8 +293,6 @@ struct kvm_arch { +@@ -295,8 +295,6 @@ struct kvm_arch { pgd_t *pgtable; u64 process_table; struct dentry *debugfs_dir; @@ -42,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> struct kvm_resize_hpt *resize_hpt; /* protected by kvm->lock */ #endif /* CONFIG_KVM_BOOK3S_HV_POSSIBLE */ #ifdef CONFIG_KVM_BOOK3S_PR_POSSIBLE -@@ -806,7 +804,6 @@ struct kvm_vcpu_arch { +@@ -809,7 +807,6 @@ struct kvm_vcpu_arch { struct kvmhv_tb_accumulator cede_time; /* time napping inside guest */ struct dentry *debugfs_dir; @@ -77,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> rc = sysfs_create_file(kernel_kobj, &fadump_release_attr.attr); --- a/arch/powerpc/kernel/setup-common.c +++ b/arch/powerpc/kernel/setup-common.c -@@ -776,8 +776,7 @@ EXPORT_SYMBOL(powerpc_debugfs_root); +@@ -779,8 +779,7 @@ EXPORT_SYMBOL(powerpc_debugfs_root); static int powerpc_debugfs_init(void) { powerpc_debugfs_root = debugfs_create_dir("powerpc", NULL); @@ -89,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #endif --- a/arch/powerpc/kernel/traps.c +++ b/arch/powerpc/kernel/traps.c -@@ -2173,35 +2173,20 @@ void ppc_warn_emulated_print(const char +@@ -2257,35 +2257,20 @@ void ppc_warn_emulated_print(const char static int __init ppc_warn_emulated_init(void) { @@ -133,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> device_initcall(ppc_warn_emulated_init); --- a/arch/powerpc/kvm/book3s_64_mmu_hv.c +++ b/arch/powerpc/kvm/book3s_64_mmu_hv.c -@@ -2142,9 +2142,8 @@ static const struct file_operations debu +@@ -2160,9 +2160,8 @@ static const struct file_operations debu void kvmppc_mmu_debugfs_init(struct kvm *kvm) { @@ -147,7 +144,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> void kvmppc_mmu_book3s_hv_init(struct kvm_vcpu *vcpu) --- a/arch/powerpc/kvm/book3s_64_mmu_radix.c +++ b/arch/powerpc/kvm/book3s_64_mmu_radix.c -@@ -1348,9 +1348,8 @@ static const struct file_operations debu +@@ -1361,9 +1361,8 @@ static const struct file_operations debu void kvmhv_radix_debugfs_init(struct kvm *kvm) { @@ -161,7 +158,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> int kvmppc_radix_init(void) --- a/arch/powerpc/kvm/book3s_hv.c +++ b/arch/powerpc/kvm/book3s_hv.c -@@ -2144,14 +2144,9 @@ static void debugfs_vcpu_init(struct kvm +@@ -2160,14 +2160,9 @@ static void debugfs_vcpu_init(struct kvm struct kvm *kvm = vcpu->kvm; snprintf(buf, sizeof(buf), "vcpu%u", id); @@ -202,58 +199,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> vcpu->arch.debugfs_exit_timing = debugfs_file; } ---- a/arch/powerpc/mm/dump_hashpagetable.c -+++ b/arch/powerpc/mm/dump_hashpagetable.c -@@ -537,13 +537,10 @@ static const struct file_operations ptdu - - static int ptdump_init(void) - { -- struct dentry *debugfs_file; -- - if (!radix_enabled()) { - populate_markers(); -- debugfs_file = debugfs_create_file("kernel_hash_pagetable", -- 0400, NULL, NULL, &ptdump_fops); -- return debugfs_file ? 0 : -ENOMEM; -+ debugfs_create_file("kernel_hash_pagetable", 0400, NULL, NULL, -+ &ptdump_fops); - } - return 0; - } ---- a/arch/powerpc/mm/dump_linuxpagetables.c -+++ b/arch/powerpc/mm/dump_linuxpagetables.c -@@ -362,12 +362,10 @@ static void build_pgtable_complete_mask( - - static int ptdump_init(void) - { -- struct dentry *debugfs_file; -- - populate_markers(); - build_pgtable_complete_mask(); -- debugfs_file = debugfs_create_file("kernel_page_tables", 0400, NULL, -- NULL, &ptdump_fops); -- return debugfs_file ? 0 : -ENOMEM; -+ debugfs_create_file("kernel_page_tables", 0400, NULL, NULL, -+ &ptdump_fops); -+ return 0; - } - device_initcall(ptdump_init); ---- a/arch/powerpc/mm/hash_utils_64.c -+++ b/arch/powerpc/mm/hash_utils_64.c -@@ -1893,11 +1893,8 @@ DEFINE_SIMPLE_ATTRIBUTE(fops_hpt_order, - - static int __init hash64_debugfs(void) - { -- if (!debugfs_create_file("hpt_order", 0600, powerpc_debugfs_root, -- NULL, &fops_hpt_order)) { -- pr_err("lpar: unable to create hpt_order debugsfs file\n"); -- } -- -+ debugfs_create_file("hpt_order", 0600, powerpc_debugfs_root, NULL, -+ &fops_hpt_order); - return 0; - } - machine_device_initcall(pseries, hash64_debugfs); --- a/arch/powerpc/platforms/4xx/ocm.c +++ b/arch/powerpc/platforms/4xx/ocm.c @@ -280,22 +280,12 @@ static const struct file_operations ocm_ @@ -297,7 +242,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> #endif /* DEBUG */ --- a/arch/powerpc/platforms/powernv/memtrace.c +++ b/arch/powerpc/platforms/powernv/memtrace.c -@@ -190,11 +190,6 @@ static int memtrace_init_debugfs(void) +@@ -191,11 +191,6 @@ static int memtrace_init_debugfs(void) snprintf(ent->name, 16, "%08x", ent->nid); dir = debugfs_create_dir(ent->name, memtrace_debugfs_dir); @@ -309,7 +254,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ent->dir = dir; debugfs_create_file("trace", 0400, dir, ent, &memtrace_fops); -@@ -318,8 +313,6 @@ static int memtrace_init(void) +@@ -319,8 +314,6 @@ static int memtrace_init(void) { memtrace_debugfs_dir = debugfs_create_dir("memtrace", powerpc_debugfs_root); @@ -377,7 +322,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 -@@ -3168,11 +3168,6 @@ static void pnv_pci_ioda_create_dbgfs(vo +@@ -3107,11 +3107,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); diff --git a/p05 b/p05 deleted file mode 100644 index 2ea5330c15d0b9..00000000000000 --- a/p05 +++ /dev/null @@ -1,113 +0,0 @@ -From e82f2d8eab210dc7eb0dba2bd8e3c64ad485442b Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Wed, 30 May 2018 16:15:35 +0200 -Subject: [PATCH] s390: no need to check return value of debugfs_create functions - -When calling debugfs functions, there is no need to ever check the -return value. The function can work or not, but the code logic should -never do something different based on this. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - arch/s390/hypfs/hypfs_dbfs.c | 4 +--- - arch/s390/include/asm/pci.h | 1 - - arch/s390/kernel/debug.c | 6 ------ - arch/s390/kernel/kdebugfs.c | 2 -- - arch/s390/kernel/sysinfo.c | 2 -- - arch/s390/pci/pci_debug.c | 13 +++---------- - 6 files changed, 4 insertions(+), 24 deletions(-) - ---- a/arch/s390/hypfs/hypfs_dbfs.c -+++ b/arch/s390/hypfs/hypfs_dbfs.c -@@ -82,8 +82,6 @@ int hypfs_dbfs_create_file(struct hypfs_ - { - df->dentry = debugfs_create_file(df->name, 0400, dbfs_dir, df, - &dbfs_ops); -- if (IS_ERR(df->dentry)) -- return PTR_ERR(df->dentry); - mutex_init(&df->lock); - return 0; - } -@@ -96,7 +94,7 @@ void hypfs_dbfs_remove_file(struct hypfs - int hypfs_dbfs_init(void) - { - dbfs_dir = debugfs_create_dir("s390_hypfs", NULL); -- return PTR_ERR_OR_ZERO(dbfs_dir); -+ return 0; - } - - void hypfs_dbfs_exit(void) ---- a/arch/s390/include/asm/pci.h -+++ b/arch/s390/include/asm/pci.h -@@ -148,7 +148,6 @@ struct zpci_dev { - enum pci_bus_speed max_bus_speed; - - struct dentry *debugfs_dev; -- struct dentry *debugfs_perf; - - struct s390_domain *s390_domain; /* s390 IOMMU domain data */ - }; ---- a/arch/s390/kernel/debug.c -+++ b/arch/s390/kernel/debug.c -@@ -1056,12 +1056,6 @@ int debug_register_view(debug_info_t *id - mode &= ~(S_IWUSR | S_IWGRP | S_IWOTH); - pde = debugfs_create_file(view->name, mode, id->debugfs_root_entry, - id, &debug_file_ops); -- if (!pde) { -- pr_err("Registering view %s/%s failed due to out of " -- "memory\n", id->name, view->name); -- rc = -1; -- goto out; -- } - spin_lock_irqsave(&id->lock, flags); - for (i = 0; i < DEBUG_MAX_VIEWS; i++) { - if (!id->views[i]) ---- a/arch/s390/kernel/kdebugfs.c -+++ b/arch/s390/kernel/kdebugfs.c -@@ -9,8 +9,6 @@ EXPORT_SYMBOL(arch_debugfs_dir); - static int __init arch_kdebugfs_init(void) - { - arch_debugfs_dir = debugfs_create_dir("s390", NULL); -- if (IS_ERR(arch_debugfs_dir)) -- arch_debugfs_dir = NULL; - return 0; - } - postcore_initcall(arch_kdebugfs_init); ---- a/arch/s390/kernel/sysinfo.c -+++ b/arch/s390/kernel/sysinfo.c -@@ -545,8 +545,6 @@ static __init int stsi_init_debugfs(void - int lvl, i; - - stsi_root = debugfs_create_dir("stsi", arch_debugfs_dir); -- if (IS_ERR_OR_NULL(stsi_root)) -- return 0; - lvl = stsi(NULL, 0, 0, 0); - if (lvl > 0) - stsi_0_0_0 = lvl; ---- a/arch/s390/pci/pci_debug.c -+++ b/arch/s390/pci/pci_debug.c -@@ -172,21 +172,14 @@ static const struct file_operations debu - void zpci_debug_init_device(struct zpci_dev *zdev, const char *name) - { - zdev->debugfs_dev = debugfs_create_dir(name, debugfs_root); -- if (IS_ERR(zdev->debugfs_dev)) -- zdev->debugfs_dev = NULL; - -- zdev->debugfs_perf = debugfs_create_file("statistics", -- S_IFREG | S_IRUGO | S_IWUSR, -- zdev->debugfs_dev, zdev, -- &debugfs_pci_perf_fops); -- if (IS_ERR(zdev->debugfs_perf)) -- zdev->debugfs_perf = NULL; -+ debugfs_create_file("statistics", S_IFREG | S_IRUGO | S_IWUSR, -+ zdev->debugfs_dev, zdev, &debugfs_pci_perf_fops); - } - - void zpci_debug_exit_device(struct zpci_dev *zdev) - { -- debugfs_remove(zdev->debugfs_perf); -- debugfs_remove(zdev->debugfs_dev); -+ debugfs_remove_recursive(zdev->debugfs_dev); - } - - int __init zpci_debug_init(void) @@ -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 -@@ -2458,22 +2458,15 @@ static int fake_panic_set(void *data, u6 +@@ -2428,22 +2428,15 @@ static int fake_panic_set(void *data, u6 DEFINE_SIMPLE_ATTRIBUTE(fake_panic_fops, fake_panic_get, fake_panic_set, "%llu\n"); @@ -119,7 +119,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> mce_register_injector_chain(&inject_nb); --- a/arch/x86/kernel/cpu/mce/severity.c +++ b/arch/x86/kernel/cpu/mce/severity.c -@@ -399,21 +399,13 @@ static const struct file_operations seve +@@ -404,21 +404,13 @@ static const struct file_operations seve static int __init severities_debugfs_init(void) { @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- a/arch/x86/xen/p2m.c +++ b/arch/x86/xen/p2m.c -@@ -810,9 +810,6 @@ static int __init xen_p2m_debugfs(void) +@@ -817,9 +817,6 @@ static int __init xen_p2m_debugfs(void) { struct dentry *d_xen = xen_init_debugfs(); @@ -2,22 +2,10 @@ usb-usb.h-tweak-struct-urb-to-remove-wasted-space.patch usb-cp210x-add-new-device-id.patch -kvm-properly-check-debugfs-dentry-before-using-it.patch 0003-toneport-fixes.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 -0004-USB-host-whci-rename-Kbuild-file.patch -0006-USB-remove-README-file.patch -0007-USB-add-missing-SPDX-lines-to-Kconfig-and-Makefiles.patch -0009-tty-ldisc-add-sysctl-to-prevent-autoloading-of-ldisc.patch -p00 -p01 p02 -p03 p04 -p05 p06 p07 p08 diff --git a/spdxcheck-print-out-files-without-any-spdx-lines.patch b/spdxcheck-print-out-files-without-any-spdx-lines.patch index cc767b3a617112..1d1d23beae0aef 100644 --- a/spdxcheck-print-out-files-without-any-spdx-lines.patch +++ b/spdxcheck-print-out-files-without-any-spdx-lines.patch @@ -14,7 +14,7 @@ Just a hack to make it easy to see what still needs to be converted. --- a/scripts/spdxcheck.py +++ b/scripts/spdxcheck.py -@@ -204,7 +204,10 @@ def scan_git_tree(tree): +@@ -210,7 +210,10 @@ def scan_git_tree(tree): if not os.path.isfile(el.path): continue with open(el.path, 'rb') as fd: diff --git a/stable-kernel-rules.rst-add-link-to-networking-patch-queue.patch b/stable-kernel-rules.rst-add-link-to-networking-patch-queue.patch deleted file mode 100644 index b98d37f3f7943d..00000000000000 --- a/stable-kernel-rules.rst-add-link-to-networking-patch-queue.patch +++ /dev/null @@ -1,30 +0,0 @@ -From foo@baz Tue Jan 22 19:43:36 CET 2019 -Date: Tue, 22 Jan 2019 19:43:36 +0100 -To: Greg KH <gregkh@linuxfoundation.org> -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Subject: [PATCH] stable-kernel-rules.rst: add link to networking patch queue - -The networking maintainer keeps a public list of the patches being -queued up for the next round of stable releases. Be sure to check there -before asking for a patch to be applied so that you do not waste -people's time. - -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Acked-by: David S. Miller <davem@davemloft.net> - ---- - Documentation/process/stable-kernel-rules.rst | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/Documentation/process/stable-kernel-rules.rst -+++ b/Documentation/process/stable-kernel-rules.rst -@@ -38,6 +38,9 @@ Procedure for submitting patches to the - - If the patch covers files in net/ or drivers/net please follow netdev stable - submission guidelines as described in - :ref:`Documentation/networking/netdev-FAQ.rst <netdev-FAQ>` -+ after first checking the stable networking queue at -+ https://patchwork.ozlabs.org/bundle/davem/stable/?series=&submitter=&state=*&q=&archive= -+ to ensure the requested patch is not already queued up. - - Security patches should not be handled (solely) by the -stable review - process but should follow the procedures in - :ref:`Documentation/admin-guide/security-bugs.rst <securitybugs>`. diff --git a/usb-cp210x-add-new-device-id.patch b/usb-cp210x-add-new-device-id.patch index 390fe91e12b197..43bd029b594c77 100644 --- a/usb-cp210x-add-new-device-id.patch +++ b/usb-cp210x-add-new-device-id.patch @@ -12,11 +12,13 @@ Reported-by: Uli <t9cpu@web.de> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: stable <stable@vger.kernel.org> -diff --git a/drivers/usb/serial/cp210x.c b/drivers/usb/serial/cp210x.c -index fffe23ab0189..f01cd0ee5621 100644 +--- + drivers/usb/serial/cp210x.c | 1 + + 1 file changed, 1 insertion(+) + --- a/drivers/usb/serial/cp210x.c +++ b/drivers/usb/serial/cp210x.c -@@ -80,6 +80,7 @@ static const struct usb_device_id id_table[] = { +@@ -80,6 +80,7 @@ static const struct usb_device_id id_tab { USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */ { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ diff --git a/usb_DEVICE_ATTR.patch b/usb_DEVICE_ATTR.patch index 8ab716650260da..216419ce0a59ee 100644 --- a/usb_DEVICE_ATTR.patch +++ b/usb_DEVICE_ATTR.patch @@ -67,8 +67,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -308,9 +307,9 @@ static ssize_t cbaf_wusb_chid_show(struc - return scnprintf(buf, PAGE_SIZE, "%s\n", pr_chid); +@@ -306,9 +305,9 @@ static ssize_t cbaf_wusb_chid_show(struc + return sprintf(buf, "%16ph\n", cbaf->chid.data); } -static ssize_t cbaf_wusb_chid_store(struct device *dev, @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -341,11 +340,10 @@ static ssize_t cbaf_wusb_chid_store(stru +@@ -339,11 +338,10 @@ static ssize_t cbaf_wusb_chid_store(stru return result; return size; } @@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -353,9 +351,9 @@ static ssize_t cbaf_wusb_host_name_show( +@@ -351,9 +349,9 @@ static ssize_t cbaf_wusb_host_name_show( return scnprintf(buf, PAGE_SIZE, "%s\n", cbaf->host_name); } @@ -108,7 +108,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -367,12 +365,11 @@ static ssize_t cbaf_wusb_host_name_store +@@ -365,12 +363,11 @@ static ssize_t cbaf_wusb_host_name_store return size; } @@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -380,9 +377,9 @@ static ssize_t cbaf_wusb_host_band_group +@@ -378,9 +375,9 @@ static ssize_t cbaf_wusb_host_band_group return scnprintf(buf, PAGE_SIZE, "0x%04x\n", cbaf->host_band_groups); } @@ -138,7 +138,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -397,10 +394,7 @@ static ssize_t cbaf_wusb_host_band_group +@@ -395,10 +392,7 @@ static ssize_t cbaf_wusb_host_band_group return size; } @@ -150,7 +150,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static const struct wusb_cbaf_device_info cbaf_device_info_defaults = { .Length_hdr = WUSB_AR_Length, -@@ -410,8 +404,8 @@ static const struct wusb_cbaf_device_inf +@@ -408,8 +402,8 @@ static const struct wusb_cbaf_device_inf .DeviceFriendlyName_hdr = WUSB_AR_DeviceFriendlyName, }; @@ -161,8 +161,8 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { struct usb_interface *iface = to_usb_interface(dev); struct cbaf *cbaf = usb_get_intfdata(iface); -@@ -421,9 +415,9 @@ static ssize_t cbaf_wusb_cdid_show(struc - return scnprintf(buf, PAGE_SIZE, "%s\n", pr_cdid); +@@ -417,9 +411,9 @@ static ssize_t cbaf_wusb_cdid_show(struc + return sprintf(buf, "%16ph\n", cbaf->cdid.data); } -static ssize_t cbaf_wusb_cdid_store(struct device *dev, @@ -174,7 +174,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -450,32 +444,28 @@ static ssize_t cbaf_wusb_cdid_store(stru +@@ -446,32 +440,28 @@ static ssize_t cbaf_wusb_cdid_store(stru return size; } @@ -215,7 +215,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> static const struct wusb_cbaf_cc_data cbaf_cc_data_defaults = { .AssociationTypeId_hdr = WUSB_AR_AssociationTypeId, -@@ -529,9 +519,9 @@ static int cbaf_cc_upload(struct cbaf *c +@@ -522,9 +512,9 @@ static int cbaf_cc_upload(struct cbaf *c return result; } @@ -228,7 +228,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> { ssize_t result; struct usb_interface *iface = to_usb_interface(dev); -@@ -559,7 +549,7 @@ static ssize_t cbaf_wusb_ck_store(struct +@@ -552,7 +542,7 @@ static ssize_t cbaf_wusb_ck_store(struct return size; } |