fix the problem that pointers access invalid addresses
This commit is contained in:
parent
f071b4db0b
commit
b944190ec7
37
backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch
Normal file
37
backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch
Normal 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;
|
||||||
|
|
||||||
@ -2,12 +2,14 @@
|
|||||||
|
|
||||||
Name: tpm2-abrmd
|
Name: tpm2-abrmd
|
||||||
Version: 2.4.0
|
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
|
Summary: A system daemon implementing the TPM2 access broker (TAB) & Resource Manager (RM) spec from the TCG
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: https://github.com/tpm2-software/tpm2-abrmd
|
URL: https://github.com/tpm2-software/tpm2-abrmd
|
||||||
Source0: https://github.com/tpm2-software/tpm2-abrmd/releases/download/%{version}/%{name}-%{version}.tar.gz
|
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: 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: tpm2-tss-devel >= 2.4.0 libtool autoconf-archive libgcrypt libgcrypt-devel
|
||||||
BuildRequires: chrpath
|
BuildRequires: chrpath
|
||||||
@ -131,7 +133,13 @@ fi
|
|||||||
%{_datadir}/selinux/packages/tabrmd.pp.bz2
|
%{_datadir}/selinux/packages/tabrmd.pp.bz2
|
||||||
|
|
||||||
%changelog
|
%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
|
- Type:enhancement
|
||||||
- ID:NA
|
- ID:NA
|
||||||
- SUG:NA
|
- SUG:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user