diff --git a/0001-usbmisc-initialize-string-buffer-before-reading-from.patch b/0001-usbmisc-initialize-string-buffer-before-reading-from.patch new file mode 100644 index 0000000000000000000000000000000000000000..ef8ffc6aaa4acec06fec451547b52daf0fef024a --- /dev/null +++ b/0001-usbmisc-initialize-string-buffer-before-reading-from.patch @@ -0,0 +1,37 @@ +From e3a98cd4870e46cefbfaa1c6f3142c70351aba02 Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +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 +Signed-off-by: Greg Kroah-Hartman +--- + 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 + diff --git a/usbutils.spec b/usbutils.spec index 2f8ba5ebb4b32875feef403296224ad82c10c200..0e5687fed2d5836759a7805f5be79a44d800c2ca 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,6 +1,6 @@ Name: usbutils Version: 012 -Release: 1 +Release: 2 Summary: Linux utilities for USB device License: GPLv2+ URL: http://www.linux-usb.org/ @@ -9,6 +9,8 @@ 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 git gcc autoconf automake libtool Requires: hwdata @@ -44,6 +46,9 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_defaultlicensedir}/%{name}/GPL-3.0.t %{_mandir}/*/* %changelog +* Thu Oct 29 2020 Zhiqiang Liu -012-2 +- backport one patch to init string buffer before reading from it + * Thu July 16 2020 liubo -012-1 - upgrade package to 012