From 1c1229d93d2ad81c30a3c21cda5c653adac9ae13 Mon Sep 17 00:00:00 2001 From: yangjiaqi Date: Mon, 12 Dec 2022 11:29:05 +0800 Subject: [PATCH] sync master --- ...ix-dev-read-memory-leak-in-container.patch | 34 +++++++++++++---- ...on-to-show-correct-proc-cpuinfo-view.patch | 25 +++++++++++++ ...idfd_send_signal-function-compilatio.patch | 37 +++++++++++++++++++ lxcfs.spec | 16 ++++++-- 4 files changed, 100 insertions(+), 12 deletions(-) rename 0019-fix-dev_name-stack-overflow.patch => 0019-fix-dev-read-memory-leak-in-container.patch (48%) create mode 100644 0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch create mode 100644 0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch diff --git a/0019-fix-dev_name-stack-overflow.patch b/0019-fix-dev-read-memory-leak-in-container.patch similarity index 48% rename from 0019-fix-dev_name-stack-overflow.patch rename to 0019-fix-dev-read-memory-leak-in-container.patch index 2b45a30..ca0f771 100644 --- a/0019-fix-dev_name-stack-overflow.patch +++ b/0019-fix-dev-read-memory-leak-in-container.patch @@ -1,14 +1,15 @@ -From 89b2479830756188cfe81cbe34fbb83a33e67dfd Mon Sep 17 00:00:00 2001 -From: yangjiaqi -Date: Wed, 2 Mar 2022 14:20:40 +0800 -Subject: [PATCH] fix dev_name stack overflow +From d67982ddf6d742b92799d1fb2e4c89e8ff87d95b Mon Sep 17 00:00:00 2001 +From: zhangsong234 +Date: Wed, 11 May 2022 15:55:47 +0800 +Subject: [PATCH] fix dev read memory leak in container +Signed-off-by: zhangsong234 --- - src/proc_fuse.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) + src/proc_fuse.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/proc_fuse.c b/src/proc_fuse.c -index 0f66c40..a1c0265 100644 +index 0f66c40..6051e9a 100644 --- a/src/proc_fuse.c +++ b/src/proc_fuse.c @@ -497,7 +497,7 @@ struct devinfo* container_dev_read(pid_t pid) { @@ -20,6 +21,15 @@ index 0f66c40..a1c0265 100644 pid_t child_pid; int mypipe[2]; int dev_num; +@@ -558,7 +558,7 @@ struct devinfo* container_dev_read(pid_t pid) { + } + closedir(dir); + stat("/", &dev_stat); +- dev_num = dev_stat.st_dev & (~0xf); ++ dev_num = dev_stat.st_dev; + fprintf(stream, "sda %d end 0 ", dev_num); + fflush(stream); + child_out: @@ -574,6 +574,7 @@ child_out: } wait_for_pid(child_pid); @@ -36,6 +46,14 @@ index 0f66c40..a1c0265 100644 } err: if (stream) +@@ -883,6 +885,7 @@ static int proc_diskstats_read(char *buf, size_t size, off_t offset, + if (total_len > size) + total_len = size; + memcpy(buf, d->buf, total_len); ++ free_devinfo_list(container_devinfo); + + return total_len; + } -- -2.32.0 (Apple Git-132) +1.8.3.1 diff --git a/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch b/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch new file mode 100644 index 0000000..8f4895e --- /dev/null +++ b/0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch @@ -0,0 +1,25 @@ +From ed5823bf5b0d8bd425417d9b3590ece248fe1655 Mon Sep 17 00:00:00 2001 +From: yangjiaqi +Date: Sat, 26 Nov 2022 11:48:14 +0800 +Subject: [PATCH] enable cfs option to show correct proc cpuinfo view + +--- + config/init/systemd/lxcfs.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/init/systemd/lxcfs.service.in b/config/init/systemd/lxcfs.service.in +index bdaa2fa..3ee006b 100644 +--- a/config/init/systemd/lxcfs.service.in ++++ b/config/init/systemd/lxcfs.service.in +@@ -6,7 +6,7 @@ Documentation=man:lxcfs(1) + + [Service] + ExecStartPre=-/usr/local/bin/lxcfs-tools prestart +-ExecStart=/usr/bin/lxcfs /var/lib/lxc/lxcfs/ ++ExecStart=/usr/bin/lxcfs --enable-cfs /var/lib/lxc/lxcfs/ + ExecStartPost=-/usr/local/bin/lxcfs-tools remount -a + KillMode=process + ExecStop=-/usr/local/bin/lxcfs-tools umount -a +-- +2.30.0 + diff --git a/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch b/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch new file mode 100644 index 0000000..ebfa7e0 --- /dev/null +++ b/0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch @@ -0,0 +1,37 @@ +From e3ca16cd280bea10a63e959623fd6625f7b868ce Mon Sep 17 00:00:00 2001 +From: yangjiaqi +Date: Thu, 24 Nov 2022 15:53:53 +0800 +Subject: [PATCH] fix pidfd_open&pidfd_send_signal function compilation bug in + glibc2.36+ + +--- + src/utils.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/utils.h b/src/utils.h +index 18d85a7..ab2da0f 100644 +--- a/src/utils.h ++++ b/src/utils.h +@@ -46,6 +46,9 @@ static inline int pidfd_open(pid_t pid, unsigned int flags) + { + return syscall(__NR_pidfd_open, pid, flags); + } ++#else ++#include ++extern int pidfd_open(pid_t pid, unsigned int flags); + #endif + + #if !HAVE_PIDFD_SEND_SIGNAL +@@ -54,6 +57,9 @@ static inline int pidfd_send_signal(int pidfd, int sig, siginfo_t *info, + { + return syscall(__NR_pidfd_send_signal, pidfd, sig, info, flags); + } ++#else ++#include ++extern int pidfd_send_signal(int pidfd, int sig, siginfo_t *info,unsigned int flags); + #endif + + extern FILE *fopen_cached(const char *path, const char *mode, +-- +2.30.0 + diff --git a/lxcfs.spec b/lxcfs.spec index 19372e9..8705406 100644 --- a/lxcfs.spec +++ b/lxcfs.spec @@ -4,7 +4,7 @@ #Basic Information Name: lxcfs Version: 4.0.11 -Release: 3 +Release: 5 Summary: FUSE filesystem for LXC License: LGPL 2.1+ URL: http://linuxcontainers.org @@ -28,7 +28,9 @@ 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 Patch9018: 0018-fix-deadlock-problem-when-subprocess-exit.patch -Patch9019: 0019-fix-dev_name-stack-overflow.patch +Patch9019: 0019-fix-dev-read-memory-leak-in-container.patch +Patch9020: 0020-enable-cfs-option-to-show-correct-proc-cpuinfo-view.patch +Patch9021: 0021-fix-pidfd_open-pidfd_send_signal-function-compilatio.patch #Dependency BuildRequires: autoconf automake libtool help2man @@ -90,8 +92,14 @@ fi %{_unitdir}/* %changelog -* Wed Mar 02 2022 yangjiaqi - 4.0.11-3 -- fix dev_name stack overflow when using fscanf +* Thu Nov 24 2022 yangjiaqi - 4.0.11-5 +- fix pidfd_open&pidfd_send_signal function compilation bug in glibc2.36+ + +* Mon Jul 04 2022 yangjiaqi - 4.0.11-4 +- enable cfs option to show correct proc cpuinfo view + +* Wed May 11 2022 zhangsong234 - 4.0.11-3 +- fix dev read memory leak in container * Fri Dec 17 2021 yangjiaqi - 4.0.11-2 - fix deadlock caused by subprocess calling lxcfs_exit -- Gitee