diff options
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_009.bb | 1 |
2 files changed, 0 insertions, 29 deletions
diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch deleted file mode 100644 index 0efdc59fc6..0000000000 --- a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch +++ /dev/null | |||
| @@ -1,28 +0,0 @@ | |||
| 1 | Fix NULL pointer crash. | ||
| 2 | |||
| 3 | Before use usbbuslist, we should check if it is valid. | ||
| 4 | |||
| 5 | Upstream-Status: Pending | ||
| 6 | Signed-off-by: Roy.Li <rongqing.li@windriver.com> | ||
| 7 | --- | ||
| 8 | lsusb-t.c | 4 ++++ | ||
| 9 | 1 files changed, 4 insertions(+), 0 deletions(-) | ||
| 10 | |||
| 11 | diff --git a/lsusb-t.c b/lsusb-t.c | ||
| 12 | index f604155..583a46a 100644 | ||
| 13 | --- a/lsusb-t.c | ||
| 14 | +++ b/lsusb-t.c | ||
| 15 | @@ -643,6 +643,10 @@ static void sort_busses(void) | ||
| 16 | /* need to reverse sort bus numbers */ | ||
| 17 | struct usbbusnode *t, *p, **pp; | ||
| 18 | int swapped; | ||
| 19 | + | ||
| 20 | + if (!usbbuslist) | ||
| 21 | + return; | ||
| 22 | + | ||
| 23 | do { | ||
| 24 | p = usbbuslist; | ||
| 25 | pp = &usbbuslist; | ||
| 26 | -- | ||
| 27 | 1.7.4.1 | ||
| 28 | |||
diff --git a/meta/recipes-bsp/usbutils/usbutils_009.bb b/meta/recipes-bsp/usbutils/usbutils_009.bb index a7cbe45406..88c24bd22a 100644 --- a/meta/recipes-bsp/usbutils/usbutils_009.bb +++ b/meta/recipes-bsp/usbutils/usbutils_009.bb | |||
| @@ -10,7 +10,6 @@ DEPENDS = "libusb zlib virtual/libiconv udev" | |||
| 10 | 10 | ||
| 11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ | 11 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ |
| 12 | file://usb-devices-avoid-dependency-on-bash.patch \ | 12 | file://usb-devices-avoid-dependency-on-bash.patch \ |
| 13 | file://Fix-NULL-pointer-crash.patch \ | ||
| 14 | " | 13 | " |
| 15 | 14 | ||
| 16 | SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad" | 15 | SRC_URI[md5sum] = "b5dbc498b2eb5058f7a57fc6532d0aad" |
