From 6e641fe09207bfa20e38b693a9d862913d9ec764 Mon Sep 17 00:00:00 2001 From: gaoyusong Date: Tue, 25 Oct 2022 11:46:01 +0800 Subject: [PATCH] fix problem that pointers access invalid address Signed-off-by: gaoyusong --- ...id-memory-access-in-tcti_tabrmd_read.patch | 37 +++++++++++++++++++ tpm2-abrmd.spec | 10 ++++- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch diff --git a/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch b/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch new file mode 100644 index 0000000..d524b3e --- /dev/null +++ b/backport-Fix-invalid-memory-access-in-tcti_tabrmd_read.patch @@ -0,0 +1,37 @@ +From 6af641bfa46130670a8462d1031f9276aeb0af1f Mon Sep 17 00:00:00 2001 +From: Nicolas Iooss +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 +--- + 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; + diff --git a/tpm2-abrmd.spec b/tpm2-abrmd.spec index 8e5d949..4584adb 100644 --- a/tpm2-abrmd.spec +++ b/tpm2-abrmd.spec @@ -2,12 +2,14 @@ Name: tpm2-abrmd Version: 2.3.3 -Release: 2 +Release: 3 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 +Patch0: 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 libtool autoconf-archive libgcrypt libgcrypt-devel BuildRequires: chrpath @@ -137,6 +139,12 @@ fi %{_datadir}/selinux/packages/tabrmd.pp.bz2 %changelog +* Tue Oct 25 2022 gaoyusong - 2.3.3-3 +- Type:bugfix +- ID:NA +- SUG:NA +- DESC:fix the problem that pointers access invalid address + * Tue May 25 2021 Hugel - 2.3.3-2 - Type:bugfix - ID:NA -- Gitee