update package to 014

This commit is contained in:
markeryang 2021-11-23 18:07:57 +08:00
parent a2d2f2153c
commit 663d275a8b
4 changed files with 5 additions and 40 deletions

View File

@ -1,37 +0,0 @@
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

Binary file not shown.

BIN
usbutils-014.tar.xz Normal file

Binary file not shown.

View File

@ -1,6 +1,6 @@
Name: usbutils Name: usbutils
Version: 012 Version: 014
Release: 5 Release: 1
Summary: Linux utilities for USB device Summary: Linux utilities for USB device
License: GPLv2+ License: GPLv2+
URL: http://www.linux-usb.org/ URL: http://www.linux-usb.org/
@ -9,7 +9,6 @@ Source0: https://www.kernel.org/pub/linux/utils/usb/usbutils/%{name}-%{version}.
Source1: GPL-2.0.txt Source1: GPL-2.0.txt
Source2: GPL-3.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 BuildRequires: libusbx-devel systemd-devel gcc autoconf automake libtool
Requires: hwdata Requires: hwdata
@ -46,6 +45,9 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_defaultlicensedir}/%{name}/GPL-3.0.t
%{_mandir}/*/* %{_mandir}/*/*
%changelog %changelog
* 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 * Tue Sep 28 2021 Wenchao Hao <haowenchao@huawei.com> - 012-5
- Nothing but to sync master and LTS branch - Nothing but to sync master and LTS branch