Skip to contentSkip to conversation

util-linux: upgrade 2.42.3 -> 2.42.4

PATCH New Jaipaul Cheernam 1 participant 1 message Sep 22

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 util-linux: upgrade 2.42.3 -> 2.42.4

- util-linux-libuuid: upgrade 2.42.3 -> 2.42.4

util-linux 2.42.4 Release Notes [1]
===============================

This release enhances previously released security fixes and adds protection against symlink attacks in the legacy mount(2)-based code in libmount.

Changes between v2.42.3 and v2.42.4:

libblkid:
- minix don't detect erofs images as minix (by Clayton Craft)

lib/fileutils:
- add safe FD-path and no-symlink helpers (by Karel Zak)
- fix RESOLVE_NO_SYMLINKS fallback value (by Karel Zak)
- fix unused parameter warnings without SYS_openat2 (by Karel Zak)

libmount:
- add mnt_fs_fetch_ids() and populate uniq_id for utab (by Karel Zak)
- use fchmodat2() for X-mount.mode= (by Karel Zak)
- restore the original namespace on error paths (by Karel Zak)
- secure the idmapped mount replacement (by Karel Zak)
- pin the legacy mount target and bind/move source (by Karel Zak)
- harden restricted mount targets and post-mount handling (by Karel Zak)
- fix X-mount.idmap ID names in code and man page (by Karel Zak)
- use USE_LIBMOUNT_MOUNTFD_SUPPORT for idmap hook (by Karel Zak)
- add missing fileutils.h include to hook_idmap.c (by Karel Zak)

mount:
- fix grammar and typo in X-mount.idmap documentation (by Karel Zak)

nsenter:
- close cgroup.procs fd after join to prevent authority leak [CVE-2026-78408] (by Karel Zak)

po:
- merge changes (by Karel Zak)
- update sv.po (from translationproject.org) (by Daniel Nylander)
- update nl.po (from translationproject.org) (by Benno Schulenberg)

po-man:
- merge changes (by Karel Zak)
- update sv.po (from translationproject.org) (by Daniel Nylander)

tools:
- add non-newmount.conf config-gen profile (by Karel Zak)

- Refresh existning patches context
- Cleanup patches which are part of this release

[1] https://github.com/util-linux/util-linux/blob/v2.42.4/Documentation/releases/v2.42.4-ReleaseNotes

---
 ...2.42.3.bb => util-linux-libuuid_2.42.4.bb} |   0
 meta/recipes-core/util-linux/util-linux.inc   |   7 +-
 ...ing-fileutils.h-include-to-hook_idma.patch |  36 ------
 ...ncrease-wait-for-flock-child-timeout.patch |   9 +-
 ...ests-script-Disable-size-option-test.patch |   2 +-
 ...x-unused-parameter-warnings-without-.patch |  66 -----------
 ...r-and-typo-in-X-mount.idmap-document.patch |  48 --------
 ...LIBMOUNT_MOUNTFD_SUPPORT-for-idmap-h.patch | 112 ------------------
 ...non-newmount.conf-config-gen-profile.patch |  26 ----
 ...t-rw-mode-for-mmap-ed-packet-socket-.patch |   7 +-
 .../util-linux/avoid_parallel_tests.patch     |   2 +-
 .../util-linux/configure-sbindir.patch        |   2 +-
 .../display_testname_for_subtest.patch        |   2 +-
 .../util-linux/util-linux/ptest.patch         |   2 +-
 ...l-linux_2.42.3.bb => util-linux_2.42.4.bb} |   0
 15 files changed, 14 insertions(+), 307 deletions(-)
 rename meta/recipes-core/util-linux/{util-linux-libuuid_2.42.3.bb => util-linux-libuuid_2.42.4.bb} (100%)
 delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-libmount-add-missing-fileutils.h-include-to-hook_idma.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/0002-lib-fileutils-fix-unused-parameter-warnings-without-.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/0003-mount-fix-grammar-and-typo-in-X-mount.idmap-document.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/0004-libmount-use-USE_LIBMOUNT_MOUNTFD_SUPPORT-for-idmap-h.patch
 delete mode 100644 meta/recipes-core/util-linux/util-linux/0005-tools-add-non-newmount.conf-config-gen-profile.patch
 rename meta/recipes-core/util-linux/{util-linux_2.42.3.bb => util-linux_2.42.4.bb} (100%)
meta/recipes-core/util-linux/util-linux-libuuid_2.42.4.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.42.3.bb +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux-libuuid_2.42.3.bb
rename to meta/recipes-core/util-linux/util-linux-libuuid_2.42.4.bb
meta/recipes-core/util-linux/util-linux.inc +1 -6
index 249ae095453..6529104e281 100644
@@ -17,16 +17,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin
            file://display_testname_for_subtest.patch \
            file://avoid_parallel_tests.patch \
            file://0001-tests-script-Disable-size-option-test.patch \
-           file://0001-libmount-add-missing-fileutils.h-include-to-hook_idma.patch \
-           file://0002-lib-fileutils-fix-unused-parameter-warnings-without-.patch \
-           file://0003-mount-fix-grammar-and-typo-in-X-mount.idmap-document.patch \
-           file://0004-libmount-use-USE_LIBMOUNT_MOUNTFD_SUPPORT-for-idmap-h.patch \
-           file://0005-tools-add-non-newmount.conf-config-gen-profile.patch \
            file://0006-tests-lsfd-accept-rw-mode-for-mmap-ed-packet-socket-.patch \
            file://0001-tests-flock-increase-wait-for-flock-child-timeout.patch \
            "
 
-SRC_URI[sha256sum] = "66ac7c0e725278eb2b039e3104f2c91119341d941b41bac7a285c695f940bd57"
+SRC_URI[sha256sum] = "fbd62a100ab7bb8746ba0661255c3c48185b1e9021507c624da01fbc696330ec"
 
 CVE_PRODUCT = "util-linux"
 
meta/recipes-core/util-linux/util-linux/0001-libmount-add-missing-fileutils.h-include-to-hook_idma.patch deleted +0 -36
deleted file mode 100644
index cb20c60c9d1..00000000000
@@ -1,36 +0,0 @@
-From 92369ef3fe1bcc48548441b68fb17786500c2bc3 Mon Sep 17 00:00:00 2001
-From: Karel Zak <[email protected]>
-Date: Wed, 2 Sep 2026 13:32:27 +0200
-Subject: [PATCH] libmount: add missing fileutils.h include to hook_idmap.c
-
-The hook_idmap.c uses RESOLVE_NO_SYMLINKS (added by commit fb8e26535)
-but does not include fileutils.h, which provides the fallback #define
-for this constant.
-
-On Fedora (glibc 2.40+), this is masked because glibc's
-<bits/fcntl-linux.h> transitively includes <linux/openat2.h>, which
-defines RESOLVE_NO_SYMLINKS. On Ubuntu (and other distros with older
-glibc), <fcntl.h> does not pull in openat2.h, so the build fails:
-
-  hook_idmap.c:335:33: error: 'RESOLVE_NO_SYMLINKS' undeclared
-
-Fixes: fb8e26535 ("libmount: pin source path with openat2() for restricted users")
-Signed-off-by: Karel Zak <[email protected]>
-Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/7e2e010874b10b3aabdc3c4c844c9ffc46a4a374]
-Signed-off-by: Jaipaul Cheernam <[email protected]>
----
- libmount/src/hook_idmap.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/libmount/src/hook_idmap.c b/libmount/src/hook_idmap.c
-index 77494e2..2c697b1 100644
---- a/libmount/src/hook_idmap.c
-+++ b/libmount/src/hook_idmap.c
-@@ -23,6 +23,7 @@
- 
- #include "strutils.h"
- #include "all-io.h"
-+#include "fileutils.h"
- #include "namespace.h"
- 
- #include "mountP.h"
meta/recipes-core/util-linux/util-linux/0001-tests-flock-increase-wait-for-flock-child-timeout.patch +4 -5
index 60b6c86eeb1..7213b007861 100644
@@ -1,6 +1,6 @@
-From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From e93cd673d49aa087f13ff9edccb2e70fa0fad9db Mon Sep 17 00:00:00 2001
 From: Pratik Farkase <[email protected]>
-Date: Wed, 17 Sep 2026 12:00:00 +0000
+Date: Thu, 17 Sep 2026 12:00:00 +0000
 Subject: [PATCH] tests: flock: increase "wait for flock child" timeout
 
 The flock test launches "flock ... bash -c '... sleep 3 ...'" in the
@@ -23,9 +23,10 @@ Signed-off-by: Pratik Farkase <[email protected]>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/tests/ts/flock/flock b/tests/ts/flock/flock
+index 85e341d..e0e5ebe 100755
 --- a/tests/ts/flock/flock
 +++ b/tests/ts/flock/flock
-@@ -65,7 +65,7 @@
+@@ -65,7 +65,7 @@ for api in flock fcntl ; do
  		ts_die "unable to run flock"
  	fi
  	# the lock should be established when flock has a child
@@ -34,5 +35,3 @@ diff --git a/tests/ts/flock/flock b/tests/ts/flock/flock
  		|| ts_die "timeout waiting for flock child"
  
  	ts_init_subtest "${subtest_prefix}non-block"
---
-2.43.0
meta/recipes-core/util-linux/util-linux/0001-tests-script-Disable-size-option-test.patch +1 -1
index a70d038cee3..a5a37d39b3d 100644
@@ -1,4 +1,4 @@
-From c83f9dbfd7d9b96e4969ab16d5db69e064c67c50 Mon Sep 17 00:00:00 2001
+From 48490e19f25b0d0eb88d861475f518074419fb92 Mon Sep 17 00:00:00 2001
 From: Paul Barker <[email protected]>
 Date: Mon, 5 Jan 2026 09:56:41 +0000
 Subject: [PATCH] tests: script: Disable size option test
meta/recipes-core/util-linux/util-linux/0002-lib-fileutils-fix-unused-parameter-warnings-without-.patch deleted +0 -66

66 lines not on this page · raw message

meta/recipes-core/util-linux/util-linux/0003-mount-fix-grammar-and-typo-in-X-mount.idmap-document.patch deleted +0 -48

48 lines not on this page · raw message

meta/recipes-core/util-linux/util-linux/0004-libmount-use-USE_LIBMOUNT_MOUNTFD_SUPPORT-for-idmap-h.patch deleted +0 -112

112 lines not on this page · raw message

meta/recipes-core/util-linux/util-linux/0005-tools-add-non-newmount.conf-config-gen-profile.patch deleted +0 -26
deleted file mode 100644
index 4a957489b1e..00000000000
@@ -1,26 +0,0 @@
-From 19b732395c1c7dc849823a3aa0d8a66122483f54 Mon Sep 17 00:00:00 2001
-From: Karel Zak <[email protected]>
-Date: Thu, 3 Sep 2026 10:15:43 +0200
-Subject: [PATCH] tools: add non-newmount.conf config-gen profile
-
-Add a configuration profile to test builds with
---disable-libmount-mountfd-support, useful for verifying that libmount
-compiles without the new fd-based mount API.
-
-Signed-off-by: Karel Zak <[email protected]>
-Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/b8159405b99af7af2054f9f8222cf23901368a01]
-Signed-off-by: Jaipaul Cheernam <[email protected]>
----
- tools/config-gen.d/non-newmount.conf | 3 +++
- 1 file changed, 3 insertions(+)
- create mode 100644 tools/config-gen.d/non-newmount.conf
-
-diff --git a/tools/config-gen.d/non-newmount.conf b/tools/config-gen.d/non-newmount.conf
-new file mode 100644
-index 0000000..303b6cb
---- /dev/null
-+++ b/tools/config-gen.d/non-newmount.conf
-@@ -0,0 +1,3 @@
-+include:core.conf
-+
-+--disable-libmount-mountfd-support
meta/recipes-core/util-linux/util-linux/0006-tests-lsfd-accept-rw-mode-for-mmap-ed-packet-socket-.patch +4 -3
index e4cb92b3bb5..63c337672a5 100644
@@ -1,4 +1,4 @@
-From e3c633ee981969d4bf53d276bc72052121774aaf Mon Sep 17 00:00:00 2001
+From 1dcf458933a755b68861816c5f2a0b7525183972 Mon Sep 17 00:00:00 2001
 From: Jaipaul Cheernam <[email protected]>
 Date: Thu, 10 Sep 2026 09:35:49 +0000
 Subject: [PATCH] tests: (lsfd) accept "rw-" mode for mmap'ed packet socket
@@ -28,6 +28,9 @@ Upstream-Status: Submitted [https://github.com/util-linux/util-linux/pull/4619]
 
 Signed-off-by: Jaipaul Cheernam <[email protected]>
 ---
+ tests/ts/lsfd/mkfds-mapped-packet-socket | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
 diff --git a/tests/ts/lsfd/mkfds-mapped-packet-socket b/tests/ts/lsfd/mkfds-mapped-packet-socket
 index ab1f72c..03d5db5 100755
 --- a/tests/ts/lsfd/mkfds-mapped-packet-socket
@@ -41,5 +44,3 @@ index ab1f72c..03d5db5 100755
  	    ${TS_CMD_LSFD} --pid "$PID" --noheadings --output SOCK.PROTONAME --filter "${EXPR}"
  	    echo 'SOCK.PROTONAME': $?
  
--- 
-2.43.0
meta/recipes-core/util-linux/util-linux/avoid_parallel_tests.patch +1 -1
index 9b94cbf1c1b..a762e2cb32e 100644
@@ -1,4 +1,4 @@
-From dde7b7ff56ed406ef96b975b88b6ab663fd10386 Mon Sep 17 00:00:00 2001
+From f9657110b4a6d7ec87b03c33b078941a4550d7b9 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <[email protected]>
 Date: Mon, 14 Jun 2021 14:00:31 +0200
 Subject: [PATCH] util-linux: Add ptest
meta/recipes-core/util-linux/util-linux/configure-sbindir.patch +1 -1
index 1c338126bf3..62d73539bf0 100644
@@ -1,4 +1,4 @@
-From 5981a174707a384d6970c7ce7d8d68322985a6fa Mon Sep 17 00:00:00 2001
+From 433f750dcc97131030e7569515b53f32e4591c14 Mon Sep 17 00:00:00 2001
 From: Phil Blundell <[email protected]>
 Date: Mon, 24 Sep 2012 07:24:51 +0100
 Subject: [PATCH] util-linux: Ensure that ${sbindir} is respected
meta/recipes-core/util-linux/util-linux/display_testname_for_subtest.patch +1 -1
index 6ffcf46295a..a1b2614a73e 100644
@@ -1,4 +1,4 @@
-From caadbbf29cfeeaac301d02185e717a5587a9cdf8 Mon Sep 17 00:00:00 2001
+From 588b121774df964e98e3443185defbc155ed009f Mon Sep 17 00:00:00 2001
 From: Tudor Florea <[email protected]>
 Date: Thu, 3 Dec 2015 04:08:00 +0100
 Subject: [PATCH] Display testname for subtest
meta/recipes-core/util-linux/util-linux/ptest.patch +1 -1
index 1fec138c3a5..84be621b4e0 100644
@@ -1,4 +1,4 @@
-From 368d04b58ce8b52e93d33be1321e78a9c6bf80ae Mon Sep 17 00:00:00 2001
+From 7f7f5fe328ef01f53b2abb3964731aac97c014c4 Mon Sep 17 00:00:00 2001
 From: Tudor Florea <[email protected]>
 Date: Thu, 3 Dec 2015 04:08:00 +0100
 Subject: [PATCH] Define TESTS variable
meta/recipes-core/util-linux/util-linux_2.42.4.bb renamed from meta/recipes-core/util-linux/util-linux_2.42.3.bb +0 -0
similarity index 100%
rename from meta/recipes-core/util-linux/util-linux_2.42.3.bb
rename to meta/recipes-core/util-linux/util-linux_2.42.4.bb