diff --git a/0003-Fix-fd-leak-with-clone_fd.patch b/0003-Fix-fd-leak-with-clone_fd.patch deleted file mode 100644 index 3332b35e5e975c98c54194c3b2541d40c6ebddc9..0000000000000000000000000000000000000000 --- a/0003-Fix-fd-leak-with-clone_fd.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 2da64ec9a37d684b73882574f391f9ad366b3c0d Mon Sep 17 00:00:00 2001 -From: Frank Dinoff -Date: Mon, 21 Mar 2022 13:13:21 -0400 -Subject: [PATCH] Fix fd leak with clone_fd - -do_interrupt would destroy_req on the request without decrementing the -channel's refcount. With clone_fd this could leak file descriptors if -the worker thread holding the cloned fd was destroyed. (Only -max_idle_threads are kept). ---- - lib/fuse_lowlevel.c | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/lib/fuse_lowlevel.c b/lib/fuse_lowlevel.c -index b5638fc..3a1e7d8 100644 ---- a/lib/fuse_lowlevel.c -+++ b/lib/fuse_lowlevel.c -@@ -123,6 +123,7 @@ static void list_add_req(struct fuse_req *req, struct fuse_req *next) - - static void destroy_req(fuse_req_t req) - { -+ assert(req->ch == NULL); - pthread_mutex_destroy(&req->lock); - free(req); - } -@@ -1712,8 +1713,11 @@ static int find_interrupted(struct fuse_session *se, struct fuse_req *req) - - pthread_mutex_lock(&se->lock); - curr->ctr--; -- if (!curr->ctr) -+ if (!curr->ctr) { -+ fuse_chan_put(req->ch); -+ req->ch = NULL; - destroy_req(curr); -+ } - - return 1; - } -@@ -1739,9 +1743,11 @@ static void do_interrupt(fuse_req_t req, fuse_ino_t nodeid, const void *inarg) - req->u.i.unique = arg->unique; - - pthread_mutex_lock(&se->lock); -- if (find_interrupted(se, req)) -+ if (find_interrupted(se, req)) { -+ fuse_chan_put(req->ch); -+ req->ch = NULL; - destroy_req(req); -- else -+ } else - list_add_req(req, &se->interrupts); - pthread_mutex_unlock(&se->lock); - } --- -2.24.0.windows.2 - diff --git a/fuse-3.10.5.tar.xz b/fuse-3.10.5.tar.xz deleted file mode 100644 index 9338a97c4352474b60d103ae1f07a9e63c9b0a3e..0000000000000000000000000000000000000000 Binary files a/fuse-3.10.5.tar.xz and /dev/null differ diff --git a/fuse-3.13.0.tar.xz b/fuse-3.13.0.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..ca997faefb816ef1e79f590f7955d83aff63e6da Binary files /dev/null and b/fuse-3.13.0.tar.xz differ diff --git a/fuse3.spec b/fuse3.spec index 949a580e8f8802d112f861b2586e245e6a689690..7c4a0de8d2e60ec031ff2ca4d147e068ee823348 100644 --- a/fuse3.spec +++ b/fuse3.spec @@ -1,8 +1,8 @@ -%global fuse3ver 3.10.5 +%global fuse3ver 3.13.0 Name: fuse3 Version: %{fuse3ver} -Release: 5 +Release: 1 Summary: User space File System of fuse3 License: GPL+ and LGPLv2+ URL: http://fuse.sf.net @@ -11,7 +11,6 @@ Source1: fuse.conf Patch1: 0001-fix-chown-and-mknod-failed.patch Patch2: 0002-revert-fuse_daemonize-chdir-to-even-if-not-run.patch -Patch3: 0003-Fix-fd-leak-with-clone_fd.patch BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build @@ -102,6 +101,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir} %{_mandir}/man8/* %changelog +* Thu Feb 9 2023 zhanchengbin -3.13.0-1 +- upgrade to 3.13.0 + * Wed Dec 7 2022 Zhiqiang Liu -3.10.5-5 - fix fd leak with clone_fd