diff options
| author |   Roy.Li <rongqing.li@windriver.com> | 2012-07-27 20:03:07 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-28 11:17:01 +0100 |
| commit | fc6c6ce73105518f4106da469ed81d53d860a290 (patch) | |
| tree | 75590992f6abd696a934ed903b46b4905bc0beda /meta/recipes-bsp/usbutils | |
| parent | e82b4fe82689c760c4910ebfc9aed6e3d9e1a2a1 (diff) | |
| download | openembedded-core-fc6c6ce73105518f4106da469ed81d53d860a290.tar.gz | |
usbutils 0.91: Fix NULL pointer crash.
[YOCTO #2847]
Before use usbbuslist, we should check if it is valid.
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp/usbutils')
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils/Fix-NULL-pointer-crash.patch | 28 | ||||
| -rw-r--r-- | meta/recipes-bsp/usbutils/usbutils_0.91.bb | 5 |
2 files changed, 31 insertions, 2 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 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 <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 + 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" |