Yocto Project Discussions
 help / color / mirror / Atom feed
From: "Diego Santa Cruz" <diego.santacruz@spinetix.com>
To: "yocto@lists.yoctoproject.org" <yocto@lists.yoctoproject.org>
Subject: [meta-security][PATCH 1/2] tpm2-abrmd-init.sh: fix for /dev/tpmrmX
Date: Fri, 6 Dec 2019 10:13:47 +0000	[thread overview]
Message-ID: <20191206101334.18436-2-Diego.SantaCruz@spinetix.com> (raw)
In-Reply-To: <20191206101334.18436-1-Diego.SantaCruz@spinetix.com>

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


  reply	other threads:[~2019-12-06 10:13 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-06 10:13 [meta-security][PATCH 0/2] tpm2-abrmd: startup fixes Diego Santa Cruz
2019-12-06 10:13 ` Diego Santa Cruz [this message]
2019-12-06 10:13 ` [meta-security][PATCH 2/2] tpm2-abrmd: Port command line options to new version Diego Santa Cruz
2019-12-07 23:32 ` [yocto] [meta-security][PATCH 0/2] tpm2-abrmd: startup fixes Armpit

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191206101334.18436-2-Diego.SantaCruz@spinetix.com \
    --to=diego.santacruz@spinetix.com \
    --cc=yocto@lists.yoctoproject.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox