coreutils: upgrade from 9.7 to 9.9
PATCH 1/3 coreutils: upgrade from 9.7 to 9.9
From: Chen Qi <[email protected]>
0001-sort-fix-buffer-under-read-CWE-127.patch is dropped as it has been in version 9.9.
Adapt to upstream change about chcon and runcon:
https://gitweb.git.savannah.gnu.org/gitweb/?p=coreutils.git;a=commit;h=8ba47d09a33f0740e071a8394f3504e0fb57948e
They are not built unless selinux is available.
---
...1-sort-fix-buffer-under-read-CWE-127.patch | 112 ------------------
.../{coreutils_9.7.bb => coreutils_9.9.bb} | 12 +-
2 files changed, 7 insertions(+), 117 deletions(-)
delete mode 100644 meta/recipes-core/coreutils/coreutils/0001-sort-fix-buffer-under-read-CWE-127.patch
rename meta/recipes-core/coreutils/{coreutils_9.7.bb => coreutils_9.9.bb} (95%)meta/recipes-core/coreutils/coreutils/0001-sort-fix-buffer-under-read-CWE-127.patch deleted +0 -112
@@ -1,112 +0,0 @@ -From 8763c305c29d0abb7e2be4695212b42917d054b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?P=C3=A1draig=20Brady?= <[email protected]> -Date: Tue, 20 May 2025 16:03:44 +0100 -Subject: [PATCH] sort: fix buffer under-read (CWE-127) - -* src/sort.c (begfield): Check pointer adjustment -to avoid Out-of-range pointer offset (CWE-823). -(limfield): Likewise. -* tests/sort/sort-field-limit.sh: Add a new test, -which triggers with ASAN or Valgrind. -* tests/local.mk: Reference the new test. -* NEWS: Mention bug fix introduced in v7.2 (2009). -Fixes https://bugs.gnu.org/78507 - -CVE: CVE-2025-5278 - -Upstream-Status: Backport [https://cgit.git.savannah.gnu.org/cgit/coreutils.git/commit/?id=8c9602e3a145e9596dc1a63c6ed67865814b6633] - -Signed-off-by: Chen Qi <[email protected]> ---- - src/sort.c | 12 ++++++++++-- - tests/local.mk | 1 + - tests/sort/sort-field-limit.sh | 35 ++++++++++++++++++++++++++++++++++ - 3 files changed, 46 insertions(+), 2 deletions(-) - create mode 100755 tests/sort/sort-field-limit.sh - -diff --git a/src/sort.c b/src/sort.c -index b10183b6f..7af1a2512 100644 ---- a/src/sort.c -+++ b/src/sort.c -@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key) - ++ptr; - - /* Advance PTR by SCHAR (if possible), but no further than LIM. */ -- ptr = MIN (lim, ptr + schar); -+ size_t remaining_bytes = lim - ptr; -+ if (schar < remaining_bytes) -+ ptr += schar; -+ else -+ ptr = lim; - - return ptr; - } -@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key) - ++ptr; - - /* Advance PTR by ECHAR (if possible), but no further than LIM. */ -- ptr = MIN (lim, ptr + echar); -+ size_t remaining_bytes = lim - ptr; -+ if (echar < remaining_bytes) -+ ptr += echar; -+ else -+ ptr = lim; - } - - return ptr; -diff --git a/tests/local.mk b/tests/local.mk -index 4da6756ac..642d225fa 100644 ---- a/tests/local.mk -+++ b/tests/local.mk -@@ -388,6 +388,7 @@ all_tests = \ - tests/sort/sort-debug-keys.sh \ - tests/sort/sort-debug-warn.sh \ - tests/sort/sort-discrim.sh \ -+ tests/sort/sort-field-limit.sh \ - tests/sort/sort-files0-from.pl \ - tests/sort/sort-float.sh \ - tests/sort/sort-h-thousands-sep.sh \ -diff --git a/tests/sort/sort-field-limit.sh b/tests/sort/sort-field-limit.sh -new file mode 100755 -index 000000000..52d8e1d17 ---- /dev/null -+++ b/tests/sort/sort-field-limit.sh -@@ -0,0 +1,35 @@ -+#!/bin/sh -+# From 7.2-9.7, this would trigger an out of bounds mem read -+ -+# Copyright (C) 2025 Free Software Foundation, Inc. -+ -+# This program is free software: you can redistribute it and/or modify -+# it under the terms of the GNU General Public License as published by -+# the Free Software Foundation, either version 3 of the License, or -+# (at your option) any later version. -+ -+# This program is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU General Public License for more details. -+ -+# You should have received a copy of the GNU General Public License -+# along with this program. If not, see <https://www.gnu.org/licenses/>. -+ -+. "${srcdir=.}/tests/init.sh"; path_prepend_ ./src -+print_ver_ sort -+getlimits_ -+ -+# This issue triggers with valgrind or ASAN -+valgrind --error-exitcode=1 sort --version 2>/dev/null && -+ VALGRIND='valgrind --error-exitcode=1' -+ -+{ printf '%s\n' aa bb; } > in || framework_failure_ -+ -+_POSIX2_VERSION=200809 $VALGRIND sort +0.${SIZE_MAX}R in > out || fail=1 -+compare in out || fail=1 -+ -+_POSIX2_VERSION=200809 $VALGRIND sort +1 -1.${SIZE_MAX}R in > out || fail=1 -+compare in out || fail=1 -+ -+Exit $fail --- -2.34.1 -
meta/recipes-core/coreutils/coreutils_9.9.bb renamed from meta/recipes-core/coreutils/coreutils_9.7.bb +7 -5
@@ -15,10 +15,9 @@ inherit autotools gettext texinfo SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \ file://remove-usr-local-lib-from-m4.patch \ - file://0001-sort-fix-buffer-under-read-CWE-127.patch \ file://run-ptest \ " -SRC_URI[sha256sum] = "e8bb26ad0293f9b5a1fc43fb42ba970e312c66ce92c1b0b16713d7500db251bf" +SRC_URI[sha256sum] = "19bcb6ca867183c57d77155eae946c5eced88183143b45ca51ad7d26c628ca75" # http://git.savannah.gnu.org/cgit/coreutils.git/commit/?id=v8.27-101-gf5d7c0842 #
@@ -47,13 +46,16 @@ PACKAGECONFIG[single-binary] = "--enable-single-binary,--disable-single-binary,, PACKAGECONFIG[selinux] = "--with-selinux,--without-selinux,libselinux" PACKAGECONFIG[openssl] = "--with-openssl=yes,--with-openssl=no,openssl" +selinux_progs = "${@'chcon runcon' if 'selinux' in d.getVar('PACKAGECONFIG') else ''}" + # [ base32 base64 df mktemp nice printenv get a special treatment and are not included in this -bindir_progs = "arch basename chcon cksum comm csplit cut dir dircolors dirname du \ +bindir_progs = "arch basename cksum comm csplit cut dir dircolors dirname du \ env expand expr factor fmt fold groups head hostid id install \ join link logname md5sum mkfifo nl nohup nproc od paste pathchk \ - pinky pr printf ptx readlink realpath runcon seq sha1sum sha224sum sha256sum \ + pinky pr printf ptx readlink realpath seq sha1sum sha224sum sha256sum \ sha384sum sha512sum shred shuf sort split sum tac tail tee test timeout \ - tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes" + tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes \ + ${selinux_progs}" base_bindir_progs = "cat chgrp chmod chown cp date dd echo false hostname kill ln ls mkdir \ mknod mv pwd rm rmdir sleep stty sync touch true uname stat"
Signature · 1 line
2.43.0
PATCH 2/3 cups: upgrade from 2.4.14 to 2.4.15
From: Chen Qi <[email protected]>
Upgrade cups from 2.4.14 to 2.4.15.
---
meta/recipes-extended/cups/{cups_2.4.14.bb => cups_2.4.15.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename meta/recipes-extended/cups/{cups_2.4.14.bb => cups_2.4.15.bb} (51%)meta/recipes-extended/cups/cups_2.4.15.bb renamed from meta/recipes-extended/cups/cups_2.4.14.bb +1 -1
@@ -2,4 +2,4 @@ require cups.inc LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI[sha256sum] = "660288020dd6f79caf799811c4c1a3207a48689899ac2093959d70a3bdcb7699" +SRC_URI[sha256sum] = "eff0bbd48ff1abcbb8e46e28e85aefaffa391a1d9c4d8dc92ab3822a13008d7f"
Signature · 1 line
2.43.0
PATCH 3/3 util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2
In reply to [email protected]From: Chen Qi <[email protected]>
The following two patches are dropped as they are in new version:
util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch
---
...2.41.1.bb => util-linux-libuuid_2.41.2.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 4 +-
...nt-api-utils-avoid-using-sys-mount.h.patch | 29 ----------
...st_sigstate.c-explicitly-reset-SIGIN.patch | 55 -------------------
...l-linux_2.41.1.bb => util-linux_2.41.2.bb} | 0
5 files changed, 1 insertion(+), 87 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.41.1.bb => util-linux-libuuid_2.41.2.bb} (100%)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch
rename meta/recipes-core/util-linux/{util-linux_2.41.1.bb => util-linux_2.41.2.bb} (100%)meta/recipes-core/util-linux/util-linux-libuuid_2.41.2.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb +0 -0
meta/recipes-core/util-linux/util-linux.inc +1 -3
@@ -19,10 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ - file://0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch \ - file://0001-include-mount-api-utils-avoid-using-sys-mount.h.patch \ " -SRC_URI[sha256sum] = "be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57" +SRC_URI[sha256sum] = "6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e" CVE_PRODUCT = "util-linux"
meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88 Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -Date: Thu, 21 Aug 2025 09:59:10 +0200 -Subject: [PATCH] include/mount-api-utils: avoid using sys/mount.h - -The file is unnecessary and introduces duplicate #define of MS_* macros. - -Fixes: https://github.com/util-linux/util-linux/issues/3674 -Signed-off-by: Karel Zak <[email protected]> -Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88] ---- - include/mount-api-utils.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h -index 920d6766a..e35524168 100644 ---- a/include/mount-api-utils.h -+++ b/include/mount-api-utils.h -@@ -6,7 +6,6 @@ - #define UTIL_LINUX_MOUNT_API_UTILS - - #ifdef HAVE_LINUX_MOUNT_H --#include <sys/mount.h> - #include <linux/mount.h> - #include <linux/unistd.h> - #include <sys/syscall.h> --- -2.34.1 -
meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux_2.41.2.bb renamed from meta/recipes-core/util-linux/util-linux_2.41.1.bb +0 -0
Signature · 1 line
2.43.0
Re: [OE-core][PATCH 3/3] util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2
Quoted 8 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
The following two patches are dropped as they are in new version:
util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patchutil-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patchSigned-off-by Chen Qi <[email protected]>---
Hi Chen,
Thanks for your patch.
It looks like this is breaking some ptests:
AssertionError:
Failed ptests:
{'util-linux': ['misc:_colors']}
https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/2673
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/2717
Ptest results can be found here:
https://valkyrie.yocto.io/pub/non-release/20251204-56/testresults/qemuarm64-ptest/core-image-ptest-util-linux/
https://valkyrie.yocto.io/pub/non-release/20251204-56/testresults/qemux86-64-ptest/core-image-ptest-util-linux/
Can you have a look at these?
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com
Re: [OE-core][PATCH 3/3] util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2
Quoted 24 lines · Mathieu Dubois-Briand
Quoted 8 lines · Chen Qi via lists.openembedded.org
From: Chen Qi <[email protected]>
The following two patches are dropped as they are in new version:
util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patchutil-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patchSigned-off-by Chen Qi <[email protected]>---
Hi Chen,
Thanks for your patch.
It looks like this is breaking some ptests:
AssertionError:
Failed ptests:
{'util-linux': ['misc:_colors']}https://autobuilder.yoctoproject.org/valkyrie/#/builders/61/builds/2673
https://autobuilder.yoctoproject.org/valkyrie/#/builders/73/builds/2717Ptest results can be found here:
Quoted 8 lines
https://valkyrie.yocto.io/pub/non-release/20251204-56/testresults/qemuarm64-ptest/core-image-ptest-util-linux/
https://valkyrie.yocto.io/pub/non-release/20251204-56/testresults/qemux86-64-ptest/core-image-ptest-util-linux/Can you have a look at these?
Thanks,
Mathieu
Got it. I'll checking what's going on.
Regards,
Qi
PATCH v2 1/1 util-linux/util-linux-libuuid: upgrade from 2.41.1 to 2.41.2
In reply to [email protected]From: Chen Qi <[email protected]>
The following two patches are dropped as they are in new version:
util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch
Ptest change:
The new test case misc/colors needs lib/color-names.c. So copy it.
---
...2.41.1.bb => util-linux-libuuid_2.41.2.bb} | 0
meta/recipes-core/util-linux/util-linux.inc | 4 +-
...nt-api-utils-avoid-using-sys-mount.h.patch | 29 ----------
...st_sigstate.c-explicitly-reset-SIGIN.patch | 55 -------------------
...l-linux_2.41.1.bb => util-linux_2.41.2.bb} | 2 +
5 files changed, 3 insertions(+), 87 deletions(-)
rename meta/recipes-core/util-linux/{util-linux-libuuid_2.41.1.bb => util-linux-libuuid_2.41.2.bb} (100%)
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch
delete mode 100644 meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch
rename meta/recipes-core/util-linux/{util-linux_2.41.1.bb => util-linux_2.41.2.bb} (99%)meta/recipes-core/util-linux/util-linux-libuuid_2.41.2.bb renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.41.1.bb +0 -0
meta/recipes-core/util-linux/util-linux.inc +1 -3
@@ -19,10 +19,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://0001-tests-ts-kill-decode-avoid-using-shell-built-in-kill.patch \ file://0001-lsfd-mkfds-foreign-sockets-skip-when-lacking-sock_di.patch \ file://0001-ts-kill-decode-use-RTMIN-from-kill-L-instead-of-hard.patch \ - file://0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch \ - file://0001-include-mount-api-utils-avoid-using-sys-mount.h.patch \ " -SRC_URI[sha256sum] = "be9ad9a276f4305ab7dd2f5225c8be1ff54352f565ff4dede9628c1aaa7dec57" +SRC_URI[sha256sum] = "6062a1d89b571a61932e6fc0211f36060c4183568b81ee866cf363bce9f6583e" CVE_PRODUCT = "util-linux"
meta/recipes-core/util-linux/util-linux/0001-include-mount-api-utils-avoid-using-sys-mount.h.patch deleted +0 -29
@@ -1,29 +0,0 @@ -From 2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88 Mon Sep 17 00:00:00 2001 -From: Karel Zak <[email protected]> -Date: Thu, 21 Aug 2025 09:59:10 +0200 -Subject: [PATCH] include/mount-api-utils: avoid using sys/mount.h - -The file is unnecessary and introduces duplicate #define of MS_* macros. - -Fixes: https://github.com/util-linux/util-linux/issues/3674 -Signed-off-by: Karel Zak <[email protected]> -Upstream-Status: Backport [https://github.com/util-linux/util-linux/commit/2a9b48d20d74f65ac708b3bcee6a7e2a61aadf88] ---- - include/mount-api-utils.h | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/include/mount-api-utils.h b/include/mount-api-utils.h -index 920d6766a..e35524168 100644 ---- a/include/mount-api-utils.h -+++ b/include/mount-api-utils.h -@@ -6,7 +6,6 @@ - #define UTIL_LINUX_MOUNT_API_UTILS - - #ifdef HAVE_LINUX_MOUNT_H --#include <sys/mount.h> - #include <linux/mount.h> - #include <linux/unistd.h> - #include <sys/syscall.h> --- -2.34.1 -
meta/recipes-core/util-linux/util-linux/0001-tests-helpers-test_sigstate.c-explicitly-reset-SIGIN.patch deleted +0 -55
55 lines not on this page · raw message
meta/recipes-core/util-linux/util-linux_2.41.2.bb renamed from meta/recipes-core/util-linux/util-linux_2.41.1.bb +2 -0
@@ -401,6 +401,8 @@ do_install_ptest() { cp -pR ${S}/tests/expected ${D}${PTEST_PATH}/tests/expected cp -pR ${S}/tests/ts ${D}${PTEST_PATH}/tests/ cp ${B}/config.h ${D}${PTEST_PATH} + # for misc/color ts + mkdir ${D}${PTEST_PATH}/lib && cp ${S}/lib/color-names.c ${D}${PTEST_PATH}/lib/ sed -i 's|@base_sbindir@|${base_sbindir}|g' ${D}${PTEST_PATH}/run-ptest
Signature · 1 line
2.43.0