Projects
Mega:24.03
util-linux
Sign Up
Log In
Username
Password
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
Expand all
Collapse all
Changes of Revision 5
View file
_service:tar_scm:util-linux.spec
Changed
@@ -3,7 +3,7 @@ Name: util-linux Version: 2.39.1 -Release: 4 +Release: 6 Summary: A random collection of Linux utilities License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git @@ -26,6 +26,10 @@ Patch6005: backport-fadvise-test-don-t-compare-fincore-page-counts.patch Patch6006: backport-fadvise-test-test-with-64k-blocks.patch Patch6007: backport-tests-lsfd-mkfds-alter-the-L4-ports-for-avo.patch +Patch6008: backport-CVE-2024-28085.patch +Patch6009: backport-tests-test_mkfds-netlink-pass-a-correct-file-descrip.patch +Patch6010: backport-tests-functions.sh-add-a-helper-funcion-making-a-dev.patch +Patch6011: backport-tests-lsfd-don-t-refer-on-the-line-follwoing-the-use.patch Patch9000: SKIPPED-no-root-permissions-test.patch %ifarch sw_64 @@ -410,6 +414,18 @@ %endif %changelog +* Mon Apr 15 2024 zhangyao <zhangyao108@huawei.com> - 2.39.1-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC:fix mkfds-rw-character-device and mkfds-ro-regular-file test failed + +* Sun Apr 7 2024 zhangyao <zhangyao108@huawei.com> - 2.39.1-5 +- Type:CVE +- CVE:CVE-2024-28085 +- SUG:NA +- DESC:fix CVE-2024-28085 and solve test_mkfds::netlink failed + * Fri Dec 1 2023 jiahua.yu <jiahua.yu@shingroup.cn> - 2.39.1-4 - Type:update - CVE:NA
View file
_service:tar_scm:backport-CVE-2024-28085.patch
Added
@@ -0,0 +1,29 @@ +From 404b0781f52f7c045ca811b2dceec526408ac253 Mon Sep 17 00:00:00 2001 +From: Karel Zak <kzak@redhat.com> +Date: Thu, 21 Mar 2024 11:16:20 +0100 +Subject: PATCH wall: fix escape sequence Injection CVE-2024-28085 + +Let's use for all cases the same output function. + +Reported-by: Skyler Ferrante <sjf5462@rit.edu> +Signed-off-by: Karel Zak <kzak@redhat.com> +--- + term-utils/wall.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/term-utils/wall.c b/term-utils/wall.c +index f894a32f8..588d3a963 100644 +--- a/term-utils/wall.c ++++ b/term-utils/wall.c +@@ -368,7 +368,7 @@ static char *makemsg(char *fname, char **mvec, int mvecsz, + int i; + + for (i = 0; i < mvecsz; i++) { +- fputs(mveci, fs); ++ fputs_careful(mveci, fs, '^', true, TERM_WIDTH); + if (i < mvecsz - 1) + fputc(' ', fs); + } +-- +2.33.0 +
View file
_service:tar_scm:backport-tests-functions.sh-add-a-helper-funcion-making-a-dev.patch
Added
@@ -0,0 +1,65 @@ +From d4dea14933bc3ee750d6762a6f615d2a4fe24c34 Mon Sep 17 00:00:00 2001 +From: Masatake YAMATO <yamato@redhat.com> +Date: Wed, 10 Apr 2024 18:36:47 +0900 +Subject: PATCH tests: (functions.sh) add a helper funcion making a device + number from given major and minor nums + +Fixes #2919. +Suggested by Karel Zak <kzak@redhat.com>. + +The original code used an obsolete formula to make a device number from +given major and minor numbers. + +ts_device_make is a new helper function based on the formula of +__SYSMACROS_DEFINE_MAKEDEV macro defined in +/usr/include/bits/sysmacros.h of GNU libc. + +Suggested by Karel Zak <kzak@redhat.com> in #2919. +Signed-off-by: Masatake YAMATO <yamato@redhat.com> +--- + tests/functions.sh | 15 +++++++++++++++ + tests/ts/lsfd/lsfd-functions.bash | 2 +- + 2 files changed, 16 insertions(+), 1 deletion(-) + +diff --git a/tests/functions.sh b/tests/functions.sh +index 5fe5ba07f..4a00b2ff4 100644 +--- a/tests/functions.sh ++++ b/tests/functions.sh +@@ -788,6 +788,21 @@ function ts_device_has { + return $res + } + ++# Based on __SYSMACROS_DEFINE_MAKEDEV macro ++# defined in /usr/include/bits/sysmacros.h of GNU libc. ++function ts_makedev ++{ ++ local major="$1" ++ local minor="$2" ++ local dev ++ ++ dev=$(( ( major & 0x00000fff ) << 8)) ++ dev=$((dev | ( major & 0xfffff000 ) << 32)) ++ dev=$((dev | ( minor & 0x000000ff ) << 0)) ++ dev=$((dev | ( minor & 0xffffff00 ) << 12)) ++ echo $dev ++} ++ + function ts_is_uuid() + { + printf "%s\n" "$1" | grep -E -q '^0-9a-z{8}-0-9a-z{4}-0-9a-z{4}-0-9a-z{4}-0-9a-z{12}$' +diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash +index 3a3f58f0c..533c25fae 100644 +--- a/tests/ts/lsfd/lsfd-functions.bash ++++ b/tests/ts/lsfd/lsfd-functions.bash +@@ -44,7 +44,7 @@ function lsfd_compare_dev { + echo 'DEVRUN:' $? + local MAJ=${DEV%:*} + local MIN=${DEV#*:} +- local DEVNUM=$(( ( MAJ << 8 ) + MIN )) ++ local DEVNUM=$(ts_makedev "$MAJ" "$MIN") + local STAT_DEVNUM=$(stat -c "%d" "$FILE") + echo 'STATRUN:' $? + if "${DEVNUM}" == "${STAT_DEVNUM}" ; then +-- +2.33.0 +
View file
_service:tar_scm:backport-tests-lsfd-don-t-refer-on-the-line-follwoing-the-use.patch
Added
@@ -0,0 +1,41 @@ +From 5aa0c75c78dfb6a0c9851b348ba778149a4550a5 Mon Sep 17 00:00:00 2001 +From: Masatake YAMATO <yamato@redhat.com> +Date: Thu, 11 Apr 2024 11:49:21 +0900 +Subject: PATCH tests: (lsfd) don't refer "$?" on the line follwoing the use + of "local" + +Suggested by ShellCheck. + +Signed-off-by: Masatake YAMATO <yamato@redhat.com> +--- + tests/ts/lsfd/lsfd-functions.bash | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/tests/ts/lsfd/lsfd-functions.bash b/tests/ts/lsfd/lsfd-functions.bash +index 533c25fae..9c2eb0785 100644 +--- a/tests/ts/lsfd/lsfd-functions.bash ++++ b/tests/ts/lsfd/lsfd-functions.bash +@@ -40,13 +40,18 @@ function lsfd_compare_dev { + ts_check_prog "expr" + ts_check_prog "stat" + +- local DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}") ++ local DEV ++ DEV=$("${LSFD}" --raw -n -o DEV -Q "${EXPR}") + echo 'DEVRUN:' $? ++ + local MAJ=${DEV%:*} + local MIN=${DEV#*:} + local DEVNUM=$(ts_makedev "$MAJ" "$MIN") +- local STAT_DEVNUM=$(stat -c "%d" "$FILE") ++ ++ local STAT_DEVNUM ++ STAT_DEVNUM=$(stat -c "%d" "$FILE") + echo 'STATRUN:' $? ++ + if "${DEVNUM}" == "${STAT_DEVNUM}" ; then + echo 'DEVNUMSTR:' 0 + else +-- +2.33.0 +
View file
_service:tar_scm:backport-tests-test_mkfds-netlink-pass-a-correct-file-descrip.patch
Added
@@ -0,0 +1,30 @@ +From acdba9c454506cdd29ac400df3f72bde4c74647d Mon Sep 17 00:00:00 2001 +From: Masatake YAMATO <yamato@redhat.com> +Date: Wed, 3 Apr 2024 00:01:27 +0900 +Subject: PATCH tests: (test_mkfds::netlink) pass a correct file descriptor + to bind(2) + +Close #2901 + +The original code passed a closed file descriptor to bind(2). + +Signed-off-by: Masatake YAMATO <yamato@redhat.com> +--- + tests/helpers/test_mkfds.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/helpers/test_mkfds.c b/tests/helpers/test_mkfds.c +index dd0a128a8..28ed3bffc 100644 +--- a/tests/helpers/test_mkfds.c ++++ b/tests/helpers/test_mkfds.c +@@ -2293,6 +2293,7 @@ static void *make_netlink(const struct factory *factory, struct fdesc fdescs, + err(EXIT_FAILURE, "failed to dup %d -> %d", sd, fdescs0.fd); + } + close(sd); ++ sd = fdescs0.fd; + } + + struct sockaddr_nl nl; +-- +2.33.0 +
Locations
Projects
Search
Status Monitor
Help
Open Build Service
OBS Manuals
API Documentation
OBS Portal
Reporting a Bug
Contact
Mailing List
Forums
Chat (IRC)
Twitter
Open Build Service (OBS)
is an
openSUSE project
.
浙ICP备2022010568号-2