From 240debafb5b647a19db2be4218432e01a9ff357f Mon Sep 17 00:00:00 2001 From: lihaoxiang Date: Tue, 1 Nov 2022 03:18:12 +0000 Subject: [PATCH] fix an runtime error reported by undefined sanitizer (cherry picked from commit cb3de5ba8df8d647854d7dbc9b4635d14cfede72) --- ...error-reported-by-undefind-sanitizer.patch | 30 +++++++++++++++++++ usbutils.spec | 6 +++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Fix-an-runtime-error-reported-by-undefind-sanitizer.patch diff --git a/0001-Fix-an-runtime-error-reported-by-undefind-sanitizer.patch b/0001-Fix-an-runtime-error-reported-by-undefind-sanitizer.patch new file mode 100644 index 0000000..adc0116 --- /dev/null +++ b/0001-Fix-an-runtime-error-reported-by-undefind-sanitizer.patch @@ -0,0 +1,30 @@ +From 96d775860fb7e404d6acaf7e8dfbd171cfbcee15 Mon Sep 17 00:00:00 2001 +From: Han Han +Date: Mon, 20 Jun 2022 16:45:19 +0800 +Subject: [PATCH] Fix an runtime error reported by undefind sanitizer + +Fix the following error when compiling with undefined sanitizer: + +./lsusb +names.c:36:29: runtime error: left shift of 16 by 27 places cannot be represented in type 'int' + +Signed-off-by: Han Han +--- + names.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/names.c b/names.c +index c8cdd02..beae8f8 100644 +--- a/names.c ++++ b/names.c +@@ -33,7 +33,7 @@ + + static unsigned int hashnum(unsigned int num) + { +- unsigned int mask1 = HASH1 << 27, mask2 = HASH2 << 27; ++ unsigned int mask1 = (unsigned int)HASH1 << 27, mask2 = (unsigned int)HASH2 << 27; + + for (; mask1 >= HASH1; mask1 >>= 1, mask2 >>= 1) + if (num & mask1) +-- +2.37.0.windows.1 diff --git a/usbutils.spec b/usbutils.spec index 2daf5ef..19ee8dc 100644 --- a/usbutils.spec +++ b/usbutils.spec @@ -1,6 +1,6 @@ Name: usbutils Version: 014 -Release: 1 +Release: 2 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-Fix-an-runtime-error-reported-by-undefind-sanitizer.patch BuildRequires: libusbx-devel systemd-devel gcc autoconf automake libtool Requires: hwdata @@ -45,6 +46,9 @@ install -D -m 644 %{SOURCE2} %{buildroot}%{_defaultlicensedir}/%{name}/GPL-3.0.t %{_mandir}/*/* %changelog +* Tue Nov 1 2022 lihaoxiang - 014-2 +- fix an runtime error reported by undefined sanitizer + * Tue Nov 23 2021 yanglongkang - 014-1 - update package to 014 -- Gitee