diff --git a/0017-proc_fuse-fix-wait-child-process-hang.patch b/0017-proc_fuse-fix-wait-child-process-hang.patch new file mode 100644 index 0000000..c55b766 --- /dev/null +++ b/0017-proc_fuse-fix-wait-child-process-hang.patch @@ -0,0 +1,30 @@ +From aa362b383ca5e79e03fd350867fb4f96a1335ae5 Mon Sep 17 00:00:00 2001 +From: zhangsong234 +Date: Thu, 27 May 2021 10:16:00 +0800 +Subject: [PATCH] proc_fuse: fix wait child process hang + +Signed-off-by: zhangsong234 +--- + src/proc_fuse.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/proc_fuse.c b/src/proc_fuse.c +index 96eb9d7..82b32c1 100644 +--- a/src/proc_fuse.c ++++ b/src/proc_fuse.c +@@ -487,11 +487,11 @@ struct devinfo* container_dev_read(pid_t pid) { + dev_num = dev_stat.st_dev & (~0xf); + fprintf(stream, "sda %d end 0 ", dev_num); + fflush(stream); ++child_out: + fclose(stream); + exit(0); + } + +-child_out: + close(mypipe[1]); + stream = fdopen(mypipe[0], "r"); + if (stream == NULL) { +-- +2.27.0 + diff --git a/lxcfs.spec b/lxcfs.spec index c3594da..9a533ee 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,7 +4,7 @@ #Basic Information Name: lxcfs Version: 4.0.5 -Release: 4 +Release: 5 Summary: FUSE filesystem for LXC License: LGPL 2.1+ URL: http://linuxcontainers.org @@ -26,6 +26,7 @@ Patch9013: 0013-add-secure-compile-option-in-Makefile.patch Patch9014: 0014-fix-proc-diskstats-show-in-container.patch Patch9015: 0015-lxcfs-adapt-4.18-kernel.patch Patch9016: 0016-remove-lxcfs-tools-dependency-for-common-use.patch +Patch9017: 0017-proc_fuse-fix-wait-child-process-hang.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -85,6 +86,9 @@ fi %{_unitdir}/* %changelog +* Thu May 27 2021 zhangsong234 - 4.0.5-5 +- proc_fuse: fix wait child process hang + * Tue Mar 30 2021 zhangsong234 - 4.0.5-4 - remove lxcfs-tools dependency for common use