packages/tpm2-abrmd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!23 fix the problem that pointers access invalid addresses

Browse Source 
From: @jinlun123123 
Reviewed-by: @zhujianwei001 
Signed-off-by: @zhujianwei001
This commit is contained in:
openeuler-ci-bot 2022-10-25 03:36:25 +00:00 committed by Gitee
commit c3258d9f6e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch Normal file
View File

@ -0,0 +1,37 @@
From 6af641bfa46130670a8462d1031f9276aeb0af1f Mon Sep 17 00:00:00 2001
From: Nicolas Iooss <nicolas.iooss@ledger.fr>
Date: Mon, 27 Sep 2021 16:46:42 +0200
Subject: [PATCH] tcti: initialize GError to NULL
When an error happens in `tcti_tabrmd_read`, Glib reports:
(process:905338): GLib-WARNING **: 06:59:08.971: GError set over the
top of a previous GError or uninitialized memory.
This indicates a bug in someone's code. You must ensure an error is
NULL before it's set.
The overwriting error message was: Error receiving data: Connection
reset by peer
This warning was reported on
https://github.com/tpm2-software/tpm2-pkcs11/issues/705
Fix the warning by initializing `error` correctly.
Signed-off-by: Nicolas Iooss <nicolas.iooss@ledger.fr>
---
src/tcti-tabrmd.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/tcti-tabrmd.c b/src/tcti-tabrmd.c
index dffe9062..f00a1f1c 100644
--- a/src/tcti-tabrmd.c
+++ b/src/tcti-tabrmd.c
@@ -187,7 +187,7 @@ tcti_tabrmd_read (TSS2_TCTI_TABRMD_CONTEXT *ctx,
size_t size,
int32_t timeout)
{
- GError *error;
+ GError *error = NULL;
ssize_t num_read;
int ret;

12
tpm2-abrmd.spec
View File

@ -2,12 +2,14 @@
Name: tpm2-abrmd
Version: 2.4.0
Release: 1
Release: 2
Summary: A system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG
License: BSD
URL: https://github.com/tpm2-software/tpm2-abrmd
Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz
Patch6000: backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch
BuildRequires: systemd pkgconfig(cmocka) pkgconfig(dbus-1) pkgconfig(gio-unix-2.0) pkgconfig(tss2-mu) pkgconfig(tss2-sys)
BuildRequires: tpm2-tss-devel >= 2.4.0 libtool autoconf-archive libgcrypt libgcrypt-devel
BuildRequires: chrpath
@ -131,7 +133,13 @@ fi
%{_datadir}/selinux/packages/tabrmd.pp.bz2
%changelog
* Mon Feb 14 2022 panxiaohe<panxh.life@foxmail.com> - 2.4.0-1
* Mon Oct 10 2022 jinlun<jinlun@huawei.com> - 2.4.0-2
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:fix the problem that pointers access invalid addresses
* Tue Dec 14 2021 panxiaohe<panxiaohe@huawei.com> - 2.4.0-1
- Type:enhancement
- ID:NA
- SUG:NA