packages/fuse3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix fd leak with clone_fd

Browse Source 
fix issue:https://gitee.com/src-openeuler/fuse3/issues/I632SP

Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
(cherry picked from commit 96216de0944a377d436d926388a443657c51eb39)
This commit is contained in:
Zhiqiang Liu 2022-12-07 16:03:33 +08:00 committed by openeuler-sync-bot
parent 67eb24b868
commit 79394beeca
2 changed files with 60 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
0006-Fix-fd-leak-with-clone_fd.patch Normal file
View File

@ -0,0 +1,55 @@
From 2da64ec9a37d684b73882574f391f9ad366b3c0d Mon Sep 17 00:00:00 2001
From: Frank Dinoff <fdinoff@google.com>
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

6
fuse3.spec
View File

@ -2,7 +2,7 @@
Name: fuse3
Version: %{fuse3ver}
Release: 9
Release: 10
Summary: User space File System of fuse3
License: GPL+ and LGPLv2+
URL: http://fuse.sf.net
@ -14,6 +14,7 @@ Patch2: 0002-libfuse-Assign-NULL-to-old-to-avoid-free-it-twice-52.patch
Patch3: 0003-fuse_lowlevel-Move-assert-for-se-before-dereferencin.patch
Patch4: 0004-revert-fuse_daemonize-chdir-to-even-if-not-run.patch
Patch5: 0005-Correct-errno-comparison-571.patch
Patch6: 0006-Fix-fd-leak-with-clone_fd.patch
BuildRequires: libselinux-devel, pkgconfig, systemd-udev, meson, fdupes
BuildRequires: autoconf, automake, libtool, gettext-devel, ninja-build
@ -104,6 +105,9 @@ install -p -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}
%{_mandir}/man8/*
%changelog
* Wed Dec 7 2022 Zhiqiang Liu <liuzhiqiang26@huawei.com> -3.9.2-10
- fix fd leak with clone_fd
* Thu Aug 18 2022 liwenchong <liwenchong@kylinos.cn> -3.9.2-9
- Correct errno comparison