diff options
| author | Pavel Skripkin <paskripkin@gmail.com> | 2021-09-07 23:03:31 +0300 |
|---|---|---|
| committer | Aleksandr Nogikh <wp32pw@gmail.com> | 2021-09-10 11:06:39 +0200 |
| commit | 7ec889b4ca1bcdd3f3e4e8a45a6521dc0bc233c3 (patch) | |
| tree | 065f2ec82581269abd48d21bac55c4906bae1b95 | |
| parent | e2776ee417c18d6e0056b058f3b6055f65206ee9 (diff) | |
tools/syz-usbgen: fix usb_ids.patch
Previous patch causes build error on top of v5.14:
error: ‘usb_bus_type’ undeclared (first use in this function); did you mean ‘hid_bus_type’?
2299 | bus_for_each_drv(&usb_bus_type, NULL, NULL, usb_device_id_dump_driver);
| ^~~~~~~~~~~~
| hid_bus_type
Fix it by including drivers/usb/core/usb.h where usb_bus_type declaration
is. Also, removed duplicate is_usb_device_driver definition, since it's
already in drivers/usb/core/usb.h.
Tested localy on qemu
Signed-off-by: Pavel Skripkin <paskripkin@gmail.com>
| -rw-r--r-- | CONTRIBUTORS | 1 | ||||
| -rw-r--r-- | tools/syz-usbgen/usb_ids.patch | 32 |
2 files changed, 17 insertions, 16 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 5026bf693..08bc3898a 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -96,3 +96,4 @@ ANSSI Vincent Dagonneau Desmond Cheong Zhi Xi Chuck Silvers +Pavel Skripkin diff --git a/tools/syz-usbgen/usb_ids.patch b/tools/syz-usbgen/usb_ids.patch index c1696d5ad..78077a896 100644 --- a/tools/syz-usbgen/usb_ids.patch +++ b/tools/syz-usbgen/usb_ids.patch @@ -1,25 +1,28 @@ -commit ea0efe3b58049ad27b63e95e73af92ae8e75b3f3 -Author: Andrey Konovalov <andreyknvl@google.com> -Date: Wed Sep 27 17:06:15 2017 +0200 +From a5c949b813199bc14e264e1440358e95b96954c9 Mon Sep 17 00:00:00 2001 +From: Pavel Skripkin <paskripkin@gmail.com> +Date: Tue, 7 Sep 2021 22:55:33 +0300 +Subject: [PATCH] usb: dump usb device ids on hid enumeration - usb: dump usb device ids on hid enumeration - - Signed-off-by: Andrey Konovalov <andreyknvl@google.com> - Change-Id: I9ba9626fe77c5a1b818d274b39c26fef9010d865 +Signed-off-by: Andrey Konovalov <andreyknvl@google.com> +Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> +--- + drivers/hid/hid-core.c | 105 +++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 105 insertions(+) diff --git a/drivers/hid/hid-core.c b/drivers/hid/hid-core.c -index 63fdbf09b044..99237de8e20a 100644 +index 7db332139f7d..e1231e2b1610 100644 --- a/drivers/hid/hid-core.c +++ b/drivers/hid/hid-core.c -@@ -27,6 +27,7 @@ +@@ -27,6 +27,8 @@ #include <linux/vmalloc.h> #include <linux/sched.h> #include <linux/semaphore.h> +#include <linux/usb.h> ++#include "../usb/core/usb.h" #include <linux/hid.h> #include <linux/hiddev.h> -@@ -2117,11 +2118,120 @@ static void hid_free_dynids(struct hid_driver *hdrv) +@@ -2192,11 +2194,114 @@ static void hid_free_dynids(struct hid_driver *hdrv) spin_unlock(&hdrv->dyn_lock); } @@ -97,12 +100,6 @@ index 63fdbf09b044..99237de8e20a 100644 + spin_unlock(&drv->dynids.lock); +} + -+static inline int is_usb_device_driver(struct device_driver *drv) -+{ -+ return container_of(drv, struct usbdrv_wrap, driver)-> -+ for_devices; -+} -+ +static int usb_device_id_dump_driver(struct device_driver *drv, void *data) +{ + struct usb_driver *usb_drv; @@ -140,3 +137,6 @@ index 63fdbf09b044..99237de8e20a 100644 spin_lock(&hdrv->dyn_lock); list_for_each_entry(dynid, &hdrv->dyn_list, list) { if (hid_match_one_id(hdev, &dynid->id)) { +-- +2.33.0 + |