From 77e8b8c53eae19b36b30410eb71e78a888201a22 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Sep 09 2021 06:18:58 +0000 Subject: import libdb-5.3.28-41.el8_4 --- diff --git a/SOURCES/db-5.3.28-mmap-high-cpu-usage.patch b/SOURCES/db-5.3.28-mmap-high-cpu-usage.patch new file mode 100644 index 0000000..90d9b2a --- /dev/null +++ b/SOURCES/db-5.3.28-mmap-high-cpu-usage.patch @@ -0,0 +1,18 @@ +Author: Filip Januš +Date: 6 Sep 2021 +Related: https://bugzilla.redhat.com/show_bug.cgi?id=1992402 + +diff -ur db-5.3.28/src/os/os_map.c db-patched/src/os/os_map.c +--- db-5.3.28/src/os/os_map.c 2013-09-09 17:35:09.000000000 +0200 ++++ db-patched/src/os/os_map.c 2021-09-06 14:32:28.792139908 +0200 +@@ -213,6 +213,10 @@ + if (rp->max < rp->size) + rp->max = rp->size; + if (ret == 0 && F_ISSET(infop, REGION_CREATE)) { ++#ifdef HAVE_MLOCK ++ if (F_ISSET(env, ENV_LOCKDOWN)) ++ rp->size = rp->max; ++#endif + if (F_ISSET(dbenv, DB_ENV_REGION_INIT)) + ret = __db_file_write(env, infop->fhp, + rp->size / MEGABYTE, rp->size % MEGABYTE, 0x00); diff --git a/SPECS/libdb.spec b/SPECS/libdb.spec index 165234a..2783ccb 100644 --- a/SPECS/libdb.spec +++ b/SPECS/libdb.spec @@ -4,7 +4,7 @@ Summary: The Berkeley DB database library for C Name: libdb Version: 5.3.28 -Release: 40%{?dist} +Release: 41%{?dist} Source0: http://download.oracle.com/berkeley-db/db-%{version}.tar.gz Source1: http://download.oracle.com/berkeley-db/db.1.85.tar.gz # For mt19937db.c @@ -73,6 +73,7 @@ Patch202: db-5.3.28-add_sys_file_h.patch # https://cov01.lab.eng.brq.redhat.com/el8-results/el8/libdb-5.3.28-31.el8+7/scan-results-imp.html#def44 # https://cov01.lab.eng.brq.redhat.com/el8-results/el8/libdb-5.3.28-31.el8+7/scan-results-imp.html#def45 Patch203: db-5.3.28-wbool_compare.patch +Patch42: db-5.3.28-mmap-high-cpu-usage.patch URL: http://www.oracle.com/database/berkeley-db/ License: BSD and LGPLv2 and Sleepycat @@ -282,7 +283,7 @@ popd %patch201 -p1 %patch202 -p1 %patch203 -p1 - +%patch42 -p1 # Delete internal AES implementation @@ -504,6 +505,11 @@ rm -rf ${RPM_BUILD_ROOT} %{_libdir}/libdb_java.so %changelog +* Mon Sep 6 2021 Filip Januš 5.3.28-41 +- Bad order of sys calls cause high CPU usage +- Resolves: #1992402 +- Patch no. 42 was added + * Mon Jul 27 2020 Matej Mužila 5.3.28-40 - Resolves: CVE-2019-2708 - Resolves: #1856237