diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:13 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-05-14 19:23:41 +0000 |
commit | 233be6e0bb85cd0320c198938f10c3443ca6d6c4 (patch) | |
tree | c8783175262d293c10e6eeba46a816ed310f9460 /debian/patches/upstream/lsns-fix-netns-use.patch | |
parent | Merging upstream version 2.40.1. (diff) | |
download | util-linux-233be6e0bb85cd0320c198938f10c3443ca6d6c4.tar.xz util-linux-233be6e0bb85cd0320c198938f10c3443ca6d6c4.zip |
Merging debian version 2.40.1-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/upstream/lsns-fix-netns-use.patch')
-rw-r--r-- | debian/patches/upstream/lsns-fix-netns-use.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/debian/patches/upstream/lsns-fix-netns-use.patch b/debian/patches/upstream/lsns-fix-netns-use.patch deleted file mode 100644 index 1d1c8b6..0000000 --- a/debian/patches/upstream/lsns-fix-netns-use.patch +++ /dev/null @@ -1,33 +0,0 @@ -From: Karel Zak <kzak@redhat.com> -Date: Mon, 22 Apr 2024 14:28:52 +0200 -Subject: lsns: fix netns use - - # ip netns add vpn - # lsns -T -t net - Segmentation fault (core dumped) - -The function interpolate_missing_namespaces() reads data from /proc. -However, in the case of a persistent namespace, there is no procfs -entry for the namespace. Therefore, this function should ignore it. - -Fixes: https://github.com/util-linux/util-linux/issues/2982 -Signed-off-by: Karel Zak <kzak@redhat.com> -(cherry picked from commit 42880f54894c1d7fd113552ff8474566a2595a0d) ---- - sys-utils/lsns.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/sys-utils/lsns.c b/sys-utils/lsns.c -index 4ea01d2..6c87c47 100644 ---- a/sys-utils/lsns.c -+++ b/sys-utils/lsns.c -@@ -793,6 +793,9 @@ static void interpolate_missing_namespaces(struct lsns *ls, struct lsns_namespac - int fd_orphan, fd_missing; - struct stat st; - -+ if (!orphan->proc) -+ return; -+ - orphan->related_ns[rela] = get_namespace(ls, orphan->related_id[rela]); - if (orphan->related_ns[rela]) - return; |