Compare commits

..

No commits in common. "cfe8af68f534af12a5bc4dd2c9dc23e9c1864fa8" and "a2d2f2153c868436d9b87e14e09fe9c727845079" have entirely different histories.

4 changed files with 41 additions and 26 deletions

View File

@ -0,0 +1,37 @@
From e3a98cd4870e46cefbfaa1c6f3142c70351aba02 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 22 Oct 2020 12:01:44 +0200
Subject: [PATCH 11/15] usbmisc: initialize string buffer before reading from
device.
Cliff Biffle points out that some devices lie about the length of their
string, so we end up with stack data in the string buffer, which is then
displayed by userspace. Fix this up by initializing the data to 0 first
before reading from the device.
Reported-by: Cliff L. Biffle <code@cliffle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
usbmisc.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/usbmisc.c b/usbmisc.c
index 9a329f2..ba0591f 100644
--- a/usbmisc.c
+++ b/usbmisc.c
@@ -210,6 +210,12 @@ char *get_dev_string(libusb_device_handle *dev, uint8_t id)
langid = get_any_langid(dev);
if (!langid) return strdup("(error)");
+ /*
+ * Some devices lie about their string size, so initialize
+ * the buffer with all 0 to account for that.
+ */
+ memset(unicode_buf, 0x00, sizeof(unicode_buf));
+
ret = libusb_get_string_descriptor(dev, id, langid,
(unsigned char *) unicode_buf,
sizeof unicode_buf);
--
1.8.3.1

BIN
usbutils-012.tar.xz Normal file

Binary file not shown.

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: usbutils
Version: 017
Release: 1
Version: 012
Release: 5
Summary: Linux utilities for USB device
License: GPLv2+
URL: http://www.linux-usb.org/
@ -9,6 +9,7 @@ Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.
Source1: GPL-2.0.txt
Source2: GPL-3.0.txt
Patch1: 0001-usbmisc-initialize-string-buffer-before-reading-from.patch
BuildRequires: libusbx-devel systemd-devel gcc autoconf automake libtool
Requires: hwdata
@ -35,7 +36,6 @@ autoreconf -vif
%make_install INSTALL="install -p"
install -D -m 644 %{SOURCE1} %{buildroot}%{_defaultlicensedir}/%{name}/GPL-2.0.txt
install -D -m 644 %{SOURCE2} %{buildroot}%{_defaultlicensedir}/%{name}/GPL-3.0.txt
rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
%files
%doc NEWS
@ -46,28 +46,6 @@ rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
%{_mandir}/*/*
%changelog
* Wed Jan 31 2024 zhanghongtao <zhanghongtao22@huawei.com> - 017-1
- update package to usbutils-017
- lsusb: add fallback names for 'lsusb -v' output
- Honor system libdir and includedir
- usbutils: lsusb-t: print entries for devices with no interfaces
- lsusb -t: sort in bus order, not reverse order
- susb-t: if a driver is not bound to an interface, report "[none]"
- Generate usbutils.pc pkgconfig file
- usbreset: Allow idProduct and idVendor to be 0
- susb: Add function that sorts the output by device ID.
- lsusb: Additional sorting by bus number.
- lsusb: This is a more compact implementation of the device list sort implemented within this pull request. The output remains the same as the one demonstrated in the previous commit.
* Tue Feb 7 2023 zhanghongtao <zhanghongtao22@hiuawei.com> - 015-1
- update package to usbutils-015
* Tue Nov 1 2022 lihaoxiang <lihaoxiang9@huawei.com> - 014-2
- fix an runtime error reported by undefined sanitizer
* Tue Nov 23 2021 yanglongkang <yanglongkang@hiuawei.com> - 014-1
- update package to 014
* Tue Sep 28 2021 Wenchao Hao <haowenchao@huawei.com> - 012-5
- Nothing but to sync master and LTS branch
@ -77,7 +55,7 @@ rm -rf %{buildroot}/%{_libdir}/pkgconfig/usbutils.pc
* Thu Oct 29 2020 Zhiqiang Liu <liuzhiqiang26@huawei.com> -012-2
- backport one patch to init string buffer before reading from it
* Thu Jul 16 2020 liubo <liubo254@huawei.com> -012-1
* Thu July 16 2020 liubo <liubo254@huawei.com> -012-1
- upgrade package to 012
* Wed Aug 21 2019 zhanghaibo <ted.zhang@huawei.com> - 010-4