packages/ima-evm-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!37 fix caps parameter cannot be parsed

Browse Source 
From: @godvi 
Reviewed-by: @HuaxinLuGitee 
Signed-off-by: @HuaxinLuGitee
This commit is contained in:
openeuler-ci-bot 2022-08-19 13:54:58 +00:00 committed by Gitee
commit a21193005c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fix-caps-parameter-cannot-be-parsed.patch Normal file
View File

@ -0,0 +1,33 @@
From 40602a7926ec13819a5926d4ac451becb44b7d98 Mon Sep 17 00:00:00 2001
From: shenxiangwei <shenxiangwei1@huawei.com>
Date: Fri, 19 Aug 2022 12:05:11 +0800
Subject: [PATCH] fix caps parameter cannot be parsed
Signed-off-by: shenxiangwei <shenxiangwei1@huawei.com>
---
src/evmctl.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/evmctl.c b/src/evmctl.c
index 28f4b8d..6ef2f68 100644
--- a/src/evmctl.c
+++ b/src/evmctl.c
@@ -440,13 +440,13 @@ static int calc_evm_hash(const char *file, unsigned char *hash)
} else if (!strcmp(*xattrname, XATTR_NAME_CAPS) && (hmac_flags & HMAC_FLAG_CAPS_SET)) {
if (!caps_str)
continue;
- err = strlen(caps_str);
+ hex2bin(xattr_value, caps_str, strlen(caps_str) >> 1);
+ err = strlen(caps_str) >> 1;
if (err >= sizeof(xattr_value)) {
log_err("caps[%u] value is too long to fit into xattr[%zu]\n",
err + 1, sizeof(xattr_value));
return -1;
}
- strcpy(xattr_value, caps_str);
} else {
err = lgetxattr(file, *xattrname, xattr_value, sizeof(xattr_value));
if (err < 0) {
--
2.27.0

6
ima-evm-utils.spec
View File

@ -1,6 +1,6 @@
Name: ima-evm-utils
Version: 1.3.1
Release: 6
Release: 7
Summary: IMA/EVM control utilities
Group: System/Libraries
License: GPLv2
@ -8,6 +8,7 @@ URL: http://linux-ima.sourceforge.net/
Source0: http://sourceforge.net/projects/linux-ima/files/ima-evm-utils/%{name}-%{version}.tar.gz
Patch9000: add-save-command-and-support-IMA-digest-list.patch
Patch9001: fix-caps-parameter-cannot-be-parsed.patch
BuildRequires: autoconf automake libtool m4 asciidoc libxslt openssl-devel
BuildRequires: keyutils-libs-devel git ima-evm-utils vim-common
@ -81,6 +82,9 @@ make check
%doc %{_mandir}/*/*
%changelog
* Fri Aug 19 2022 shenxiangwei <shenxiangwei1@huawei.com> - 1.3.1-7
- Fix caps parameter cannot be parsed
* Mon May 31 2021 Anakin Zhang <benjamin93@163.com> - 1.3.1-6
- fix make check issue