usbutils: drop upstreamed patch

This has been fixed upstream since 008, albeit slightly differently so the patch
continued to apply.

(From OE-Core rev: e65ec7a68de6a0d409a5750b2fbd7ebca9acf5a3)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2018-03-05 17:09:31 +00:00
committed by Richard Purdie
parent 68956c3a86
commit e42aad1a75
2 changed files with 0 additions and 29 deletions

View File

@@ -1,28 +0,0 @@
Fix NULL pointer crash.
Before use usbbuslist, we should check if it is valid.
Upstream-Status: Pending
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
---
lsusb-t.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/lsusb-t.c b/lsusb-t.c
index f604155..583a46a 100644
--- a/lsusb-t.c
+++ b/lsusb-t.c
@@ -643,6 +643,10 @@ static void sort_busses(void)
/* need to reverse sort bus numbers */
struct usbbusnode *t, *p, **pp;
int swapped;
+
+ if (!usbbuslist)
+ return;
+
do {
p = usbbuslist;
pp = &usbbuslist;
--
1.7.4.1

View File

@@ -10,7 +10,6 @@ DEPENDS = "libusb zlib virtual/libiconv udev"
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \
file://usb-devices-avoid-dependency-on-bash.patch \
file://Fix-NULL-pointer-crash.patch \
"
SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad"