Compare commits

...

No commits in common. "imports/c8-beta/fuse-sshfs-2.8-5.el8" and "c8s" have entirely different histories.

7 changed files with 57 additions and 3 deletions

View File

@ -1 +0,0 @@
2b792aa5b3a45e0c3fe65c44bd9da8f64a690830 SOURCES/sshfs-2.8.tar.gz

1
.gitignore vendored
View File

@ -1 +1,2 @@
SOURCES/sshfs-2.8.tar.gz SOURCES/sshfs-2.8.tar.gz
/sshfs-2.8.tar.gz

View File

@ -3,13 +3,19 @@
Name: fuse-sshfs Name: fuse-sshfs
Version: 2.8 Version: 2.8
Release: 5%{?dist} Release: 7%{?dist}
Summary: FUSE-Filesystem to access remote filesystems via SSH Summary: FUSE-Filesystem to access remote filesystems via SSH
Group: System Environment/Base Group: System Environment/Base
License: GPLv2 License: GPLv2
URL: https://github.com/libfuse/sshfs URL: https://github.com/libfuse/sshfs
Source0: https://github.com/libfuse/sshfs/releases/download/sshfs_%{version}/sshfs-%{version}.tar.gz Source0: https://github.com/libfuse/sshfs/releases/download/sshfs_%{version}/sshfs-%{version}.tar.gz
Source1: https://github.com/libfuse/sshfs/releases/download/sshfs_%{version}/sshfs-%{version}.tar.gz.asc Source1: https://github.com/libfuse/sshfs/releases/download/sshfs_%{version}/sshfs-%{version}.tar.gz.asc
# Fix premature free() in sftp_readdir_async()
# https://bugzilla.redhat.com/show_bug.cgi?id=2000223
# https://github.com/libfuse/sshfs/commit/cc5d6bbbc5b7e78296f5245988b9ba947076a1b8.patch
Patch1: sshfs-fix-premature-free.patch
Provides: sshfs = %{version}-%{release} Provides: sshfs = %{version}-%{release}
Requires: fuse >= 2.2 Requires: fuse >= 2.2
Requires: openssh-clients Requires: openssh-clients
@ -26,7 +32,7 @@ mounting the filesystem is as easy as logging into the server with ssh.
%prep %prep
%setup -q -n sshfs-%{version} %autosetup -p1 -n sshfs-%{version}
%build %build
@ -46,6 +52,13 @@ make install DESTDIR=%{buildroot}
%changelog %changelog
* Tue Sep 07 2021 Richard W.M. Jones <rjones@redhat.com> - 2.8-7
- Fix premature free() in sftp_readdir_async()
resolves: rhbz#2000223
* Thu Mar 21 2019 Richard W.M. Jones <rjones@redhat.com> - 2.8-6
- Add gating tests resolves: rhbz#1682788
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-5 * Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 2.8-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-8
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

1
sources Normal file
View File

@ -0,0 +1 @@
SHA512 (sshfs-2.8.tar.gz) = a3c6a75137a4410a0c4e049ffdb6e219319add9673de32cf32a74c12ff4bb80f92a6e75088417a180a4dd01957deec39bd780a02140e8b0348f5868c92d67cfd

View File

@ -0,0 +1,34 @@
diff -ur sshfs-2.8.old/ChangeLog sshfs-2.8/ChangeLog
--- sshfs-2.8.old/ChangeLog 2016-06-22 19:38:01.000000000 +0100
+++ sshfs-2.8/ChangeLog 2021-09-07 08:17:35.352080786 +0100
@@ -1,3 +1,9 @@
+ Unreleased Changes
+ ------------------
+
++* Fixed a crash due to a race condition when listing
++ directory contents.
+
Release 2.7 (2016-06-22)
------------------------
diff -ur sshfs-2.8.old/sshfs.c sshfs-2.8/sshfs.c
--- sshfs-2.8.old/sshfs.c 2016-06-08 16:42:12.000000000 +0100
+++ sshfs-2.8/sshfs.c 2021-09-07 08:17:06.339682726 +0100
@@ -2173,11 +2173,16 @@
outstanding--;
if (done) {
+ /* We need to cache want_reply, since processing
+ thread may free req right after unlock() if
+ want_reply == 0 */
+ int want_reply;
pthread_mutex_lock(&sshfs.lock);
if (sshfs_req_pending(req))
req->want_reply = 0;
+ want_reply = req->want_reply;
pthread_mutex_unlock(&sshfs.lock);
- if (!req->want_reply)
+ if (!want_reply)
continue;
}