diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2021-08-25 13:37:52 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-08-26 08:05:52 +0100 |
| commit | d469dfa08ae52ca720ef1315994050f956b6ea50 (patch) | |
| tree | d1352077fd56856151376d0713eb09ff4e7986e4 | |
| parent | 592335a75dbf28d2e3c5f0c62ad96d38420ae1f9 (diff) | |
| download | openembedded-core-contrib-d469dfa08ae52ca720ef1315994050f956b6ea50.tar.gz | |
util-linux: upgrade 2.37.1 -> 2.37.2
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb (renamed from meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb) | 0 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch | 33 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.37.2.bb (renamed from meta/recipes-core/util-linux/util-linux_2.37.1.bb) | 0 |
4 files changed, 1 insertions, 35 deletions
diff --git a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb index 5d759aed94..5d759aed94 100644 --- a/meta/recipes-core/util-linux/util-linux-libuuid_2.37.1.bb +++ b/meta/recipes-core/util-linux/util-linux-libuuid_2.37.2.bb diff --git a/meta/recipes-core/util-linux/util-linux.inc b/meta/recipes-core/util-linux/util-linux.inc index 0f17c73e86..1e3cd28801 100644 --- a/meta/recipes-core/util-linux/util-linux.inc +++ b/meta/recipes-core/util-linux/util-linux.inc @@ -35,7 +35,6 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/util-linux/v${MAJOR_VERSION}/util-lin file://run-ptest \ file://display_testname_for_subtest.patch \ file://avoid_parallel_tests.patch \ - file://CVE-2021-37600.patch \ " -SRC_URI[sha256sum] = "8e4bd42053b726cf86eb4d13a73bc1d9225a2c2e1a2e0d2a891f1020f83e6b76" +SRC_URI[sha256sum] = "6a0764c1aae7fb607ef8a6dd2c0f6c47d5e5fd27aa08820abaad9ec14e28e9d9" diff --git a/meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch b/meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch deleted file mode 100644 index 2b306c435b..0000000000 --- a/meta/recipes-core/util-linux/util-linux/CVE-2021-37600.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 1c9143d0c1f979c3daf10e1c37b5b1e916c22a1c Mon Sep 17 00:00:00 2001 -From: Karel Zak <kzak@redhat.com> -Date: Tue, 27 Jul 2021 11:58:31 +0200 -Subject: [PATCH] sys-utils/ipcutils: be careful when call calloc() for uint64 - nmembs - -Fix: https://github.com/karelzak/util-linux/issues/1395 -Signed-off-by: Karel Zak <kzak@redhat.com> - -CVE: CVE-2021-37600 -Upstream-Status: Backport [1c9143d0c1f979c3daf10e1c37b5b1e916c22a1c] - -Signed-off-by: Dragos-Marian Panait <dragos.panait@windriver.com> ---- - sys-utils/ipcutils.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sys-utils/ipcutils.c b/sys-utils/ipcutils.c -index e784c4dcb..18868cfd3 100644 ---- a/sys-utils/ipcutils.c -+++ b/sys-utils/ipcutils.c -@@ -218,7 +218,7 @@ static void get_sem_elements(struct sem_data *p) - { - size_t i; - -- if (!p || !p->sem_nsems || p->sem_perm.id < 0) -+ if (!p || !p->sem_nsems || p->sem_nsems > SIZE_MAX || p->sem_perm.id < 0) - return; - - p->elements = xcalloc(p->sem_nsems, sizeof(struct sem_elem)); --- -2.25.1 - diff --git a/meta/recipes-core/util-linux/util-linux_2.37.1.bb b/meta/recipes-core/util-linux/util-linux_2.37.2.bb index 9351595144..9351595144 100644 --- a/meta/recipes-core/util-linux/util-linux_2.37.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.37.2.bb |