[meta-security][PATCH 0/2] tpm2-abrmd: startup fixes

[meta-security][PATCH 0/2] tpm2-abrmd: startup fixes

[Diego Santa Cruz]

This ports patches from the meta-measured layer that fix tpm2-abrmd
not starting up.
The first patch is necessary on kernels 4.12 and later.
The second patch is necessary after the update to 2.3.0.

Philip Tricca (1):
  tpm2-abrmd: Port command line options to new version.

Trevor Woerner (1):
  tpm2-abrmd-init.sh: fix for /dev/tpmrmX

 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.18.1

[meta-security][PATCH 1/2] tpm2-abrmd-init.sh: fix for /dev/tpmrmX

[Diego Santa Cruz]

From: Trevor Woerner <twoerner@gmail.com>

Newer kernels, in addition to the traditional /dev/tpmX device nodes, are now
also creating /dev/tpmrmX device nodes. This causes this script to get
confused and abort, meaning tpm2-abrmd does not get started during boot.

Fix for https://github.com/flihp/meta-measured/issues/56

Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com>
---
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
index c8dfb7d..9bb7da9 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh
@@ -27,7 +27,7 @@ case "${1}" in
 	start)
 		echo -n "Starting $DESC: "
 
-		if [ ! -e /dev/tpm* ]
+		if [ ! -e /dev/tpm? ]
 		then
 			echo "device driver not loaded, skipping."
 			exit 0
-- 
2.18.1

[meta-security][PATCH 2/2] tpm2-abrmd: Port command line options to new version.

[Diego Santa Cruz]

From: Philip Tricca <flihp@twobit.org>

These have changed upstream.

Signed-off-by: Philip Tricca <flihp@twobit.org>
Signed-off-by: Diego Santa Cruz <Diego.SantaCruz@spinetix.com>
---
 meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default
index 987978a..b4b3c20 100644
--- a/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default
+++ b/meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default
@@ -1 +1 @@
-DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transient-objects=20 --fail-on-loaded-trans"
+DAEMON_OPTS="--tcti=device --logger=syslog --max-connections=20 --max-transients=20 --flush-all"
-- 
2.18.1

Re: [yocto] [meta-security][PATCH 0/2] tpm2-abrmd: startup fixes

[Armpit]

[-- Attachment #1: Type: text/plain, Size: 1067 bytes --]

merged.
thanks,
Armin

On 12/6/19 2:13 AM, Diego Santa Cruz via Lists.Yoctoproject.Org wrote:
> This ports patches from the meta-measured layer that fix tpm2-abrmd
> not starting up.
> The first patch is necessary on kernels 4.12 and later.
> The second patch is necessary after the update to 2.3.0.
>
> Philip Tricca (1):
>   tpm2-abrmd: Port command line options to new version.
>
> Trevor Woerner (1):
>   tpm2-abrmd-init.sh: fix for /dev/tpmrmX
>
>  meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd-init.sh | 2 +-
>  meta-tpm/recipes-tpm2/tpm2-abrmd/files/tpm2-abrmd.default | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
>
> View/Reply Online (#47581): https://lists.yoctoproject.org/g/yocto/message/47581
> Mute This Topic: https://lists.yoctoproject.org/mt/67467010/1024635
> Group Owner: yocto+owner@lists.yoctoproject.org
> Unsubscribe: https://lists.yoctoproject.org/g/yocto/unsub  [akuster@mvista.com]
> -=-=-=-=-=-=-=-=-=-=-=-


[-- Attachment #2: Type: text/html, Size: 2028 bytes --]