From a18b397a3ea101083ff8249f7f0ac16e1b2e9a2c Mon Sep 17 00:00:00 2001 From: "Roy.Li" Date: Fri, 27 Jul 2012 20:03:07 +0800 Subject: usbutils 0.91: Fix NULL pointer crash. [YOCTO #2847] Before use usbbuslist, we should check if it is valid. (From OE-Core rev: fc6c6ce73105518f4106da469ed81d53d860a290) Signed-off-by: Roy.Li Signed-off-by: Richard Purdie --- .../usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 ++++++++++++++++++++++ meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch (limited to 'meta') diff --git a/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch new file mode 100644 index 0000000000..0efdc59fc6 --- /dev/null +++ b/meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch @@ -0,0 +1,28 @@ +Fix NULL pointer crash. + +Before use usbbuslist, we should check if it is valid. + +Upstream-Status: Pending +Signed-off-by: Roy.Li +--- + 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 + diff --git a/meta/recipes-bsp/usbutils/usbutils_0.91.bb b/meta/recipes-bsp/usbutils/usbutils_0.91.bb index 04d1681e1d..abe807cd33 100644 --- a/meta/recipes-bsp/usbutils/usbutils_0.91.bb +++ b/meta/recipes-bsp/usbutils/usbutils_0.91.bb @@ -7,10 +7,11 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" DEPENDS = "libusb zlib" -PR = "r4" +PR = "r5" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/usb/usbutils/usbutils-${PV}.tar.gz \ - file://usb-devices-avoid-dependency-on-bash.patch" + file://usb-devices-avoid-dependency-on-bash.patch \ + file://Fix-NULL-pointer-crash.patch" SRC_URI[md5sum] = "49de2403b40bf3a9863faaa8d3858deb" SRC_URI[sha256sum] = "c122346b0225121bcf159abf804116f826a4a3462c94ce7b8871f7559e6b3a46" -- cgit v1.2.3-54-g00ecf