!25 Automatically generate code patches with openeuler

From: @zhendongchen
Reviewed-by: @yorifang
Signed-off-by: @yorifang
This commit is contained in:
openeuler-ci-bot 2021-02-26 14:45:21 +08:00 committed by Gitee
commit 89a7f1b22c
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,29 @@
From 360a23478dda391daa056c08a7c564f5b350e43a Mon Sep 17 00:00:00 2001
From: nocjj <1250062498@qq.com>
Date: Thu, 21 Jan 2021 10:57:09 +0800
Subject: [PATCH] bugfix: add check to avoid invalid ptr for strcmp
If len of d_name is less than "pid", it will pass a invalid ptr
to strcmp, which will cause crash.
---
src/domain.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/src/domain.c b/src/domain.c
index 7f9173d..f8dea48 100644
--- a/src/domain.c
+++ b/src/domain.c
@@ -253,6 +253,10 @@ static int check_pid_file(const char *d_name)
int extern_len = strlen(extern_name);
int len = strlen(d_name);
+ if (len <= extern_len) {
+ return -1;
+ }
+
return strcmp(d_name + len - extern_len, extern_name);
}
--
2.27.0

View File

@ -1,6 +1,6 @@
Name: vmtop Name: vmtop
Version: 1.1 Version: 1.1
Release: 2 Release: 3
Summary: A tool for collecting and analyzing data of virtual machine Summary: A tool for collecting and analyzing data of virtual machine
License: Mulan PSL V2 License: Mulan PSL V2
Group: Application/System Group: Application/System
@ -27,6 +27,7 @@ Patch0016: proc-del-prc-pid-comm-read.patch
Patch0017: display-del-screen-clear-after-key-response.patch Patch0017: display-del-screen-clear-after-key-response.patch
Patch0018: arch-add-x86-kvm-exits-items.patch Patch0018: arch-add-x86-kvm-exits-items.patch
Patch0019: codestyle-del-unused-var.patch Patch0019: codestyle-del-unused-var.patch
Patch0020: bugfix-add-check-to-avoid-invalid-ptr-for-strcmp.patch
Requires: libvirt, ncurses Requires: libvirt, ncurses
@ -67,6 +68,9 @@ install -m 550 vmtop ${RPM_BUILD_ROOT}/usr/bin/%{name}
%{_bindir}/vmtop %{_bindir}/vmtop
%changelog %changelog
* Thu Jan 21 2021 Huawei Technologies Co., Ltd <alex.chen@huawei.com>
- bugfix: add check to avoid invalid ptr for strcmp
* Thu 14 Jan 2021 Jiajun Chen <1250062498@qq.com> -1.1-2 * Thu 14 Jan 2021 Jiajun Chen <1250062498@qq.com> -1.1-2
- vcp_stat: add Max Scheduling Delay time items to display - vcp_stat: add Max Scheduling Delay time items to display
- args: add -p option - args: add -p option