diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:17:36 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-30 10:17:36 +0100 |
| commit | 40c493e29885df8b9e3eaef8418af97ce8a90967 (patch) | |
| tree | 027d2db67f512bc754bd315b69330af03f88be68 | |
| parent | fcc8d57689005dc360ad29bc63d06a844efc11c4 (diff) | |
| download | patches-40c493e29885df8b9e3eaef8418af97ce8a90967.tar.gz | |
new patches added
| -rw-r--r-- | kvm-properly-check-debugfs-dentry-before-using-it.patch | 4 | ||||
| -rw-r--r-- | series | 2 | ||||
| -rw-r--r-- | usb-cp210x-add-new-device-id.patch | 26 | ||||
| -rw-r--r-- | usb-usb.h-tweak-struct-urb-to-remove-wasted-space.patch | 35 |
4 files changed, 64 insertions, 3 deletions
diff --git a/kvm-properly-check-debugfs-dentry-before-using-it.patch b/kvm-properly-check-debugfs-dentry-before-using-it.patch index 29a8d3c9d70cf2..419de3dd9baaab 100644 --- a/kvm-properly-check-debugfs-dentry-before-using-it.patch +++ b/kvm-properly-check-debugfs-dentry-before-using-it.patch @@ -15,12 +15,10 @@ 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: Paolo Bonzini <pbonzini@redhat.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(-) @@ -1,5 +1,7 @@ # +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 diff --git a/usb-cp210x-add-new-device-id.patch b/usb-cp210x-add-new-device-id.patch new file mode 100644 index 00000000000000..390fe91e12b197 --- /dev/null +++ b/usb-cp210x-add-new-device-id.patch @@ -0,0 +1,26 @@ +From foo@baz Tue Mar 26 13:48:17 KST 2019 +Date: Tue, 26 Mar 2019 13:48:17 +0900 +To: Greg KH <gregkh@linuxfoundation.org> +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Subject: [PATCH] USB: cp210x: add new device id + +Lorenz Messtechnik has a device that is controlled by the cp210x driver, +so add the device id to the driver. The device id was provided by +Silicon-Labs for the devices from this vendor. + +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 +--- a/drivers/usb/serial/cp210x.c ++++ b/drivers/usb/serial/cp210x.c +@@ -80,6 +80,7 @@ static const struct usb_device_id id_table[] = { + { USB_DEVICE(0x10C4, 0x804E) }, /* Software Bisque Paramount ME build-in converter */ + { USB_DEVICE(0x10C4, 0x8053) }, /* Enfora EDG1228 */ + { USB_DEVICE(0x10C4, 0x8054) }, /* Enfora GSM2228 */ ++ { USB_DEVICE(0x10C4, 0x8056) }, /* Lorenz Messtechnik devices */ + { USB_DEVICE(0x10C4, 0x8066) }, /* Argussoft In-System Programmer */ + { USB_DEVICE(0x10C4, 0x806F) }, /* IMS USB to RS422 Converter Cable */ + { USB_DEVICE(0x10C4, 0x807A) }, /* Crumb128 board */ diff --git a/usb-usb.h-tweak-struct-urb-to-remove-wasted-space.patch b/usb-usb.h-tweak-struct-urb-to-remove-wasted-space.patch new file mode 100644 index 00000000000000..83641335d1f9b1 --- /dev/null +++ b/usb-usb.h-tweak-struct-urb-to-remove-wasted-space.patch @@ -0,0 +1,35 @@ +From cde8161f9ee466655588b66a106276044b2fc282 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +Date: Fri, 1 Mar 2019 18:13:27 +0100 +Subject: [PATCH] USB: usb.h: tweak struct urb to remove wasted space + +By moving one field around in 'struct urb' we reduce the size of the +structure by 8 bytes. + +Before the patch on x86_64 the overall size of the structure as reported +by pahole was: + /* size: 192, cachelines: 3, members: 30 */ + /* sum members: 184, holes: 2, sum holes: 8 */ +After the patch we now have: + /* size: 184, cachelines: 3, members: 30 */ + /* last cacheline: 56 bytes */ + +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + include/linux/usb.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/usb.h ++++ b/include/linux/usb.h +@@ -1545,10 +1545,10 @@ typedef void (*usb_complete_t)(struct ur + struct urb { + /* private: usb core and host controller only fields in the urb */ + struct kref kref; /* reference count of the URB */ ++ int unlinked; /* unlink error code */ + void *hcpriv; /* private data for host controller */ + atomic_t use_count; /* concurrent submissions counter */ + atomic_t reject; /* submissions will fail */ +- int unlinked; /* unlink error code */ + + /* public: documented fields in the urb that can be used by drivers */ + struct list_head urb_list; /* list head for use by the urb's |