Projects
openEuler:Mainline
procps-ng
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:procps-ng.spec
Changed
@@ -1,6 +1,6 @@ Name: procps-ng Version: 4.0.2 -Release: 4 +Release: 6 Summary: Utilities that provide system information. License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ URL: https://sourceforge.net/projects/procps-ng/ @@ -16,6 +16,8 @@ Patch5: backport-0001-ps-address-missing-or-corrupted-fields-with-m-option.patch Patch6: backport-0002-ps-trade-previous-fix-for-final-solution-to-m-option.patch Patch7: backport-top-lessen-summary-cpu-distortions-with-first-displa.patch +Patch8: backport-pmap-Increase-memory-allocation-failure-judgment.patch +Patch9: backport-top-added-guest-tics-when-multiple-cpus-were-merged.patch BuildRequires: ncurses-devel libtool autoconf automake gcc gettext-devel systemd-devel @@ -98,6 +100,12 @@ %{_mandir}/man* %changelog +* Wed Jun 28 2023 zhoujie <zhoujie133@huawei.com> - 4.0.2-6 +- top: added guest tics when multiple cpus were merged + +* Mon Jun 26 2023 zhoujie <zhoujie133@huawei.com> - 4.0.2-5 +- pamp: increase memory allocation failure judgment + * Tue Jun 13 2023 zhoujie <zhoujie133@huawei.com> - 4.0.2-4 - top: first time display delay
View file
_service:tar_scm:backport-pmap-Increase-memory-allocation-failure-judgment.patch
Added
@@ -0,0 +1,41 @@ +From b51ef773ad5cbd3eb9e348df4f70eb03307ce044 Mon Sep 17 00:00:00 2001 +From: EulerOSWander <314264452@qq.com> +Date: Mon, 12 Jun 2023 14:19:30 +0800 +Subject: PATCH pmap: Increase memory allocation failure judgment + +Call trace: + #0 __vsnprintf_internal + #1 0x00007f967aedd656 in __GI___snprintf + #2 0x00005612da28c707 in snprintf + #3 config_read (rc_filename=<optimized out>) at pmap.c:885 + #4 0x00005612da28b8c0 int main at pmap.c:1144 + +The above stack is caused by calling a null pointer +after the memory allocation fails. Increase the null +pointer judgment. + +signed-off-by: zhoujie <zhoujie133@huawei.com> +--- + src/pmap.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/pmap.c b/src/pmap.c +index 658b2501..74d57dab 100644 +--- a/src/pmap.c ++++ b/src/pmap.c +@@ -881,7 +881,11 @@ static int config_read (char *rc_filename) + } + + /* add the field in the list */ +- cnf_listnode = calloc(1, sizeof *cnf_listnode); ++ if (!(cnf_listnode = calloc(1, sizeof *cnf_listnode))) { ++ xwarnx(_("memory allocation failed")); ++ fclose(f); ++ return 0; ++ } + snprintf(cnf_listnode -> description, sizeof(cnf_listnode -> description), "%s", token); + cnf_listnode -> next = cnf_listhead; + cnf_listhead = cnf_listnode; +-- +2.33.0 +
View file
_service:tar_scm:backport-top-added-guest-tics-when-multiple-cpus-were-merged.patch
Added
@@ -0,0 +1,32 @@ +From 833cdc64f06989fc1949d056e8ec11d5cd99e4c0 Mon Sep 17 00:00:00 2001 +From: hdzhoujie <zhoujie133@huawei.com> +Date: Wed, 19 Apr 2023 19:40:31 +0800 +Subject: PATCH top: added 'guest' tics when multiple cpus were merged + +The 'guest' tics are added in the +sum_tics function, but when multiple +cpus are combined for display, the +'guest' tics are not added cumulatively +in the sum_unify function. + +signed-off-by: zhoujie <zhoujie133@huawei.com> +--- + src/top/top.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/top/top.c b/src/top/top.c +index 02ef8f6d..abe6e66c 100644 +--- a/src/top/top.c ++++ b/src/top/top.c +@@ -6396,6 +6396,8 @@ static int sum_unify (struct stat_stack *this, int nobuf) { + stackstat_IR.result.sl_int += rSv(stat_IR, sl_int); + stackstat_SI.result.sl_int += rSv(stat_SI, sl_int); + stackstat_ST.result.sl_int += rSv(stat_ST, sl_int); ++ stackstat_GU.result.sl_int += rSv(stat_GU, sl_int); ++ stackstat_GN.result.sl_int += rSv(stat_GN, sl_int); + stackstat_SUM_USR.result.sl_int += rSv(stat_SUM_USR, sl_int); + stackstat_SUM_SYS.result.sl_int += rSv(stat_SUM_SYS, sl_int); + stackstat_SUM_TOT.result.sl_int += rSv(stat_SUM_TOT, sl_int); +-- +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