Fix a crash if a transfer outlives closing the device

Fix a crash after libusb_exit API has been misused
Resolves: #2050638
2022-02-15 12:03:38 +01:00 · 2022-02-10 12:08:40 +01:00 · 2022-02-02 20:11:52 +01:00
13 changed files with 137 additions and 256 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -1,9 +1,2 @@
 /libusb-1.0.24.tar.bz2
 /libusb-1.0.25.tar.bz2
-/libusb-1.0.26.tar.bz2
-/libusb-1.0.27.tar.bz2
-/libusb-1.0.27.tar.bz2.asc
-/libusb-1.0.28.tar.bz2
-/libusb-1.0.28.tar.bz2.asc
-/libusb-1.0.29.tar.bz2
-/libusb-1.0.29.tar.bz2.asc
--- a/1058.patch
+++ b/1058.patch
@ -0,0 +1,24 @@
+From 2529a3fc4f987f93e0774af865ac7cb6557bd0c2 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Fri, 4 Feb 2022 22:50:28 +0100
+Subject: [PATCH] core: Unset device ctx if it has been destroyed
+
+Devices can outlive their context in some cases (in particular with
+python garbage collection). Guard against this happening by clearing the
+ctx pointer so that it is not pointing to uninitialized memory.
+---
+ libusb/core.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libusb/core.c b/libusb/core.c
+index 7893ac23..1c1ada14 100644
+--- a/libusb/core.c
+++ b/libusb/core.c
+@@ -2441,6 +2441,7 @@ void API_EXPORTED libusb_exit(libusb_context *ctx)
+ 	for_each_device(_ctx, dev) {
+ 		usbi_warn(_ctx, "device %d.%d still referenced",
+ 			dev->bus_number, dev->device_address);
+		DEVICE_CTX(dev) = NULL;
+ 	}
+ 
+ 	if (!list_empty(&_ctx->open_devs))
--- a/1073.patch
+++ b/1073.patch
@ -0,0 +1,72 @@
+From bf833ee6adf58bd4a4a468aa729cdc78bdc13ede Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 15 Feb 2022 11:13:41 +0100
+Subject: [PATCH 1/2] core: Catch NULL dev_handle when getting a transfer's
+ context
+
+The dev_handle will be set to NULL when the transfer is still in-flight
+while the device is closed. In that case, the transfer free function
+will try to access the context and would run into a NULL pointer
+dereference.
+
+Add a test for dev_handle being valid before dereferencing it further.
+---
+ libusb/libusbi.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libusb/libusbi.h b/libusb/libusbi.h
+index 158a9af5..dde43df2 100644
+--- a/libusb/libusbi.h
+++ b/libusb/libusbi.h
+@@ -330,7 +330,7 @@ void usbi_log(struct libusb_context *ctx, enum libusb_log_level level,
+ 
+ #define DEVICE_CTX(dev)		((dev)->ctx)
+ #define HANDLE_CTX(handle)	(DEVICE_CTX((handle)->dev))
+-#define TRANSFER_CTX(transfer)	(HANDLE_CTX((transfer)->dev_handle))
+#define TRANSFER_CTX(transfer)	((transfer)->dev_handle ? HANDLE_CTX((transfer)->dev_handle) : NULL)
+ #define ITRANSFER_CTX(itransfer) \
+ 	(TRANSFER_CTX(USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer)))
+ 
+
+From 6428090ea77dfb80906a146977ea7fd6de4718c8 Mon Sep 17 00:00:00 2001
+From: Benjamin Berg <bberg@redhat.com>
+Date: Tue, 15 Feb 2022 10:59:00 +0100
+Subject: [PATCH 2/2] io: Unset dev_handle when removing transfer from flying
+ list
+
+API users might hold on to transfers a bit longer than they are in the
+flying list. If they then close the device prior to freeing all
+transfers, we would end up with invalid pointers to the device.
+
+Fix this by setting the device handle to NULL when removing the device
+from the flying list. This matches the behaviour when the device is
+closed while the transfer is still in the flying list.
+
+Specifically, the libgusb wrapper will currently only free the
+underlying transfer in a later mainloop iteration (as a side effect on
+how GTask does memory management). It is possible to fix this, but it
+would make memory management within libgusb much more error prone.
+---
+ libusb/io.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/libusb/io.c b/libusb/io.c
+index 0d2ac9ea..4e6d8984 100644
+--- a/libusb/io.c
+++ b/libusb/io.c
+@@ -1456,6 +1456,7 @@ static int add_to_flying_list(struct usbi_transfer *itransfer)
+  * if it fails to update the timer for the next timeout. */
+ static int remove_from_flying_list(struct usbi_transfer *itransfer)
+ {
+	struct libusb_transfer *transfer = USBI_TRANSFER_TO_LIBUSB_TRANSFER(itransfer);
+ 	struct libusb_context *ctx = ITRANSFER_CTX(itransfer);
+ 	int rearm_timer;
+ 	int r = 0;
+@@ -1466,6 +1467,7 @@ static int remove_from_flying_list(struct usbi_transfer *itransfer)
+ 	list_del(&itransfer->list);
+ 	if (rearm_timer)
+ 		r = arm_timer_for_next_timeout(ctx);
+	transfer->dev_handle = NULL;
+ 	usbi_mutex_unlock(&ctx->flying_transfers_lock);
+ 
+ 	return r;
--- a/15
+++ b/15
@ -1,15 +0,0 @@
-* Fri Sep 30 2022 Kate Hsuan <hpa@redhat.com> 1.0.26-1
- Update to 1.0.26 
-
-* Wed Feb 02 2022 Benjamin Berg <bberg@redhat.com> 1.0.25-1
- Update to 1.0.25
-
-* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.24-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.0.24-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jan 19 18:47:55 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.0.24-3
- New libusb1 package replacing libusbx
-  Resolves: #1918269
--- a/gating.yaml
+++ b/gating.yaml
@ -3,10 +3,4 @@ product_versions:
  - fedora-*
 decision_context: bodhi_update_push_testing
 rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
--- !Policy
-product_versions:
-  - fedora-*
-decision_context: bodhi_update_push_stable
-rules:
-  - !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
+  - !PassingTestCaseRule {test_case_name: dist.depcheck}
--- a/libusb1.keyring
+++ b/libusb1.keyring
@ -1,117 +0,0 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: Hostname: 
-Version: Hockeypuck 2.2
-
-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
-=sExt
-----END PGP PUBLIC KEY BLOCK-----
--- a/libusb1.spec
+++ b/libusb1.spec
@ -1,32 +1,22 @@
-%bcond mingw %[0%{?fedora} && !0%{?flatpak}]
-
 Summary:        Library for accessing USB devices
 Name:           libusb1
-Version:        1.0.29
-Release:        %autorelease
+Version:        1.0.25
+Release:        3%{?dist}
 Source0:        https://github.com/libusb/libusb/releases/download/v%{version}/libusb-%{version}.tar.bz2
-Source1:        https://github.com/libusb/libusb/releases/download/v%{version}/libusb-%{version}.tar.bz2.asc
-Source2:        https://keyserver.ubuntu.com/pks/lookup?op=get&search=0xc68187379b23de9efc46651e2c80ff56c6830a0e#/%{name}.keyring
-License:        LGPL-2.1-or-later
+License:        LGPLv2+
 URL:            http://libusb.info
 BuildRequires:  systemd-devel doxygen libtool
-BuildRequires:  umockdev-devel
 BuildRequires:  make
 BuildRequires:  gcc
-BuildRequires:  gnupg2
 # libusbx was removed in F34
 Provides:       libusbx = %{version}-%{release}
 Obsoletes:      libusbx < %{version}-%{release}

-%if %{with mingw}
-BuildRequires:  mingw32-filesystem >= 95
-BuildRequires:  mingw32-gcc-c++
-BuildRequires:  mingw64-filesystem >= 95
-BuildRequires:  mingw64-gcc-c++
-# mingw-libusbx was removed in F42
-Provides:       mingw-libusbx = %{version}-%{release}
-Obsoletes:      mingw-libusbx < %{version}-%{release}
-%endif
+# Fix a crash after libusb_exit API has been misused
+# https://bugzilla.redhat.com/show_bug.cgi?id=2050638
+Patch0001:      https://github.com/libusb/libusb/pull/1058.patch
+# Fix a crash if a transfer outlives closing the device
+Patch0002:      https://github.com/libusb/libusb/pull/1073.patch

 %description
 This package provides a way for applications to access USB devices.
@ -70,40 +60,14 @@ Obsoletes:      libusbx-tests-examples < %{version}-%{release}
 %description tests-examples
 This package contains tests and examples for %{name}.

-%if %{with mingw}
-%package -n mingw32-%{name}
-Summary:       MinGW Windows %{name} library
-Provides:      mingw32-libusbx = %{version}-%{release}
-Obsoletes:     mingw32-libusbx < %{version}-%{release}
-
-%description -n mingw32-%{name}
-MinGW Windows %{name} library.
-
-%package -n mingw64-%{name}
-Summary:       MinGW Windows %{name} library
-Provides:      mingw64-libusbx = %{version}-%{release}
-Obsoletes:     mingw64-libusbx < %{version}-%{release}
-
-%description -n mingw64-%{name}
-MinGW Windows %{name} library.
-%endif

 %prep
-%{gpgverify} --keyring='%{SOURCE2}' --signature='%{SOURCE1}' --data='%{SOURCE0}'
 %autosetup -p1 -n libusb-%{version}
 chmod -x examples/*.c
 mkdir -p m4
-sed -i '/AM_LDFLAGS = -static/d' tests/Makefile.am
-autoscan
-aclocal
-autoconf
-automake --add-missing


 %build
-mkdir %{_target_os}
-pushd %{_target_os}
-%define _configure ../configure
 %configure --disable-static --enable-examples-build
 %{make_build}
 pushd doc
@ -112,24 +76,12 @@ popd
 pushd tests
 make
 popd
-popd
-
-%if %{with mingw}
-# MinGW build
-%mingw_configure --disable-static
-%mingw_make_build
-%endif


 %install
-pushd %{_target_os}
 %{make_install}
 mkdir -p $RPM_BUILD_ROOT%{_bindir}
-install -m 755 tests/.libs/init_context $RPM_BUILD_ROOT%{_bindir}/libusb-test-init_context
-install -m 755 tests/.libs/set_option $RPM_BUILD_ROOT%{_bindir}/libusb-test-set_option
 install -m 755 tests/.libs/stress $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
-install -m 755 tests/.libs/stress_mt $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress_mt
-install -m 755 tests/.libs/umockdev $RPM_BUILD_ROOT%{_bindir}/libusb-test-umockdev
 install -m 755 examples/.libs/testlibusb \
    $RPM_BUILD_ROOT%{_bindir}/libusb-test-libusb
 # Some examples are very device-specific / require specific hw and miss --help
@ -139,23 +91,13 @@ for i in fxload listdevs xusb; do
        $RPM_BUILD_ROOT%{_bindir}/libusb-example-$i
 done
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
-popd
-
-%if %{with mingw}
-%mingw_make_install
-%endif


 %check
-pushd %{_target_os}
 LD_LIBRARY_PATH=libusb/.libs ldd $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
-LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-init_context
-LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-set_option
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-stress
-LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-umockdev
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-test-libusb
 LD_LIBRARY_PATH=libusb/.libs $RPM_BUILD_ROOT%{_bindir}/libusb-example-listdevs
-popd


 %ldconfig_scriptlets
@ -172,36 +114,27 @@ popd
 %{_libdir}/pkgconfig/libusb-1.0.pc

 %files devel-doc
-%doc %{_target_os}/doc/api-1.0 examples/*.c
+%doc doc/api-1.0 examples/*.c

 %files tests-examples
 %{_bindir}/libusb-example-fxload
 %{_bindir}/libusb-example-listdevs
 %{_bindir}/libusb-example-xusb
-%{_bindir}/libusb-test-init_context
-%{_bindir}/libusb-test-set_option
 %{_bindir}/libusb-test-stress
-%{_bindir}/libusb-test-stress_mt
-%{_bindir}/libusb-test-umockdev
 %{_bindir}/libusb-test-libusb

-%if %{with mingw}
-%files -n mingw32-libusb1
-%license COPYING
-%doc AUTHORS README ChangeLog
-%{mingw32_bindir}/libusb-1.0.dll
-%{mingw32_includedir}/libusb-1.0
-%{mingw32_libdir}/*.dll.a
-%{mingw32_libdir}/pkgconfig/libusb-1.0.pc
-
-%files -n mingw64-libusb1
-%license COPYING
-%doc AUTHORS README ChangeLog
-%{mingw64_bindir}/libusb-1.0.dll
-%{mingw64_includedir}/libusb-1.0
-%{mingw64_libdir}/*.dll.a
-%{mingw64_libdir}/pkgconfig/libusb-1.0.pc
-%endif

 %changelog
-%autochangelog
+* Tue Feb 15 2022 Benjamin Berg <bberg@redhat.com> - 1.0.25-3
+- Fix a crash if a transfer outlives closing the device
+
+* Thu Feb 10 2022 Benjamin Berg <bberg@redhat.com> - 1.0.25-2
+-Fix a crash after libusb_exit API has been misused
+ Resolves: #2050638
+
+* Wed Feb 02 2022 Benjamin Berg <bberg@redhat.com> - 1.0.25-1
+- Update to 1.0.25
+
+* Tue Jan 19 18:47:55 CET 2021 Benjamin Berg <bberg@redhat.com> - 1.0.24-3
+- New libusb1 package replacing libusbx
+  Resolves: #1918269
--- a/plans/integration.fmf
+++ b/plans/integration.fmf
@ -1,11 +0,0 @@
-summary: Basic smoke test
-discover:
-    how: fmf
-prepare:
-  - name: packages
-    how: install
-    package:
-        - glibc-common
-        - libusb1-tests-examples
-execute:
-    how: tmt
--- a/3
+++ b/3
@ -1,2 +1 @@
-SHA512 (libusb-1.0.29.tar.bz2) = 04f8bda8197c9ecf52709609b8fbfea762fd82ddb5cde153a7630b0e8ed557d42da8cbc44f2f593aa22fdd0762e16716300565d67adb0c5240d7f3723321f690
-SHA512 (libusb-1.0.29.tar.bz2.asc) = 57e12d3a58d8ac418e28f6d83a7cb8c0268ed5d2752707796aa5bf1f8bcf2a8083aa664d36ffcdcc96da62153afa792728662fa8230be9e2865d4a37003e199d
+SHA512 (libusb-1.0.25.tar.bz2) = f1e6e5577d4bd1ff136927dc66c615014a06ac332ddd797b1d1ad5f7b68e2405e66068dcb210e2f0ae3e31681603ef72efbd88bf7fbe0eb41ce700fdc3f92f9d
--- a/tests/integration/main.fmf
+++ b/tests/integration/main.fmf
@ -1,6 +0,0 @@
-summary:
-    Test for libusb1
-test: bash ./run.sh
-
-
-
--- a/tests/integration/run.sh
+++ b/tests/integration/run.sh
@ -4,6 +4,5 @@ set -e

 ldd /usr/bin/libusb-test-stress
 /usr/bin/libusb-test-stress
-/usr/bin/libusb-test-umockdev
 /usr/bin/libusb-test-libusb
 /usr/bin/libusb-example-listdevs
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,17 @@
+---
+- hosts: localhost
+  roles:
+  - role: standard-test-source
+    tags:
+    - always
+    required_packages:
+    - git
+  - role: standard-test-basic
+    tags:
+    - atomic
+    - classic
+    tests:
+    - test:
+        dir: .
+        run: run.sh
+
Author	SHA1	Message	Date
Benjamin Berg	4c3e829a05	Fix a crash if a transfer outlives closing the device	2022-02-15 12:03:38 +01:00
Benjamin Berg	7b03a79ced	Fix a crash after libusb_exit API has been misused Resolves: #2050638	2022-02-10 12:08:40 +01:00
Benjamin Berg	cc2d2322eb	Update to 1.0.25	2022-02-02 20:11:52 +01:00