!33 tpm2-abrmd:update version to 2.4.1
From: @jinlun123123 Reviewed-by: @huangzq6 Signed-off-by: @huangzq6
This commit is contained in:
commit
42f0d84c0e
@ -1,37 +0,0 @@
|
|||||||
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;
|
|
||||||
|
|
||||||
Binary file not shown.
BIN
tpm2-abrmd-2.4.1.tar.gz
Normal file
BIN
tpm2-abrmd-2.4.1.tar.gz
Normal file
Binary file not shown.
@ -1,15 +1,13 @@
|
|||||||
%global selinuxtype targeted
|
%global selinuxtype targeted
|
||||||
|
|
||||||
Name: tpm2-abrmd
|
Name: tpm2-abrmd
|
||||||
Version: 2.4.0
|
Version: 2.4.1
|
||||||
Release: 3
|
Release: 1
|
||||||
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
|
||||||
@ -47,9 +45,9 @@ This package contains SELinux policies for tpm2-abrmd
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1 -n %{name}-%{version}
|
%autosetup -p1 -n %{name}-%{version}
|
||||||
|
autoreconf --install
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export GDBUS_CODEGEN="/usr/bin/gdbus-codegen"
|
|
||||||
%configure --disable-static --disable-silent-rules \
|
%configure --disable-static --disable-silent-rules \
|
||||||
--with-systemdsystemunitdir=%{_unitdir} \
|
--with-systemdsystemunitdir=%{_unitdir} \
|
||||||
--with-systemdpresetdir=%{_presetdir} \
|
--with-systemdpresetdir=%{_presetdir} \
|
||||||
@ -137,6 +135,12 @@ fi
|
|||||||
%{_datadir}/selinux/packages/tabrmd.pp.bz2
|
%{_datadir}/selinux/packages/tabrmd.pp.bz2
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Nov 23 2022 jinlun<jinlun@huawei.com> - 2.4.1-1
|
||||||
|
- Type:enhancement
|
||||||
|
- ID:NA
|
||||||
|
- SUG:NA
|
||||||
|
- DESC:update to 2.4.1
|
||||||
|
|
||||||
* Thu Nov 3 wuzx<wuzx1226@qq.com> - 2.4.0-3
|
* Thu Nov 3 wuzx<wuzx1226@qq.com> - 2.4.0-3
|
||||||
- Type:feature
|
- Type:feature
|
||||||
- CVE:NA
|
- CVE:NA
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user