Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
From:   Pankaj Gupta <pankaj.gupta@nxp.com>
To:     gaurav.jain@nxp.com, sahil.malhotra@nxp.com,
        kshitiz.varshney@nxp.com, horia.geanta@nxp.com,
        linux-kernel@vger.kernel.org, V.Sethi@nxp.com
Cc:     Pankaj Gupta <pankaj.gupta@nxp.com>
Subject: [RFC PATCH HBK: 1/8] keys-trusted: new cmd line option added
Date:   Mon,  5 Sep 2022 20:06:24 +0530
Message-Id: <20220905143631.2832-2-pankaj.gupta@nxp.com>
In-Reply-To: <20220905143631.2832-1-pankaj.gupta@nxp.com>
References: <20220905143631.2832-1-pankaj.gupta@nxp.com>
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?aUs6xZzyMiMwXxoTbqfvW/q7OkthAa2AD6+wLp71yeez9oHhoid9UfWJ9axc?=
 =?us-ascii?Q?gkKTup6I1d5NYMt0XE0bOvzGfC59adVF/B5FkusBK29gMJf7tEiBxbYEqV/1?=
 =?us-ascii?Q?F2KmBOm9RoZUcuIg41520yoRMjpocH2RhppWTQAIYdK41xp31WIvT2i9KTuD?=
 =?us-ascii?Q?s4H8Qo6WZ+MM89Rer0LEIsWoBeCaSvYGvWILDEMfuijniHqQK69py3AnL2xC?=
 =?us-ascii?Q?tkig8AbX43448FhB1cViml7dpZwzm70jYKgU8bDMXTNhOYHEvpcD4i0adqwr?=
 =?us-ascii?Q?zQn5FCw30r0GVw5Cw6z+dXUUuqwmOcAHFMSKTUHf3Y5cIggLegcGxPjIbLUu?=
 =?us-ascii?Q?VjX2tywWh0/ESn1CobxAzSG+MCAunigZRuSuK45rPLY6ywyzv1RyksdQ4GK7?=
 =?us-ascii?Q?rVJIAhYFA8Yy27GkcjYGqsw+dezgXQUr/ySY5DhIAZCXa7J1mHuBWcVBW2OY?=
 =?us-ascii?Q?Q10TpCCLZBbmvA/OIte/jQieLRvBzQW/GVbTUl3mmyYDXVUcnRmM/+mAcgiX?=
 =?us-ascii?Q?47At4t58pOdL9avcQ4U6qTETaPpbQB1V2npRvivVD5ESfu+4FwogOY4Kk+hL?=
 =?us-ascii?Q?VM9LNaT1E53cOkOYa333zNPRLTgpArSmxBnkSkhaBFRZIPI8xj6eh2QzqOIo?=
 =?us-ascii?Q?UW0Frpn0VycigcCEOVY46MbgSBwE4Fk4afTN1TMeBEar0Hj1A30FCOtmLeUu?=
 =?us-ascii?Q?ysnobVF8HbgCAqH1JH+OL9+oWulpn0hbN7YcUZUB0BsoMGhZxjRJR79gYswB?=
 =?us-ascii?Q?TAki6jXd22W99mVIDLTTvXrxTRleoLSbXBs43L848i+cAxHCI8jjjCgvKTyC?=
 =?us-ascii?Q?lpTJkuZU9pbWjl3UpVJCxgOeKsvBBMq6SLkAGqtTAj6SdrelsQBIuVqXi/Lc?=
 =?us-ascii?Q?PgW2pgeacL99l4feTB40Fqmsasi6HvqoGST8urQy8CrfRf6Be41TcjXa/mQ7?=
 =?us-ascii?Q?NcQ1Jna/zCFbifXayV56FAwh5pPNwEQAOsEaBDzUk9yc2H1845Sp0hvsyUii?=
 =?us-ascii?Q?lL5sZSmIeLgTv14An+85zURCkAWWspt0pc9ChAEjpfuAMefQvSsHxB+0mpb/?=
 =?us-ascii?Q?uNTAknnL7nhLBOWhhK5oWgfemeGDQeHOxC8Pg54Oi4Vgzzk7yQLDL70IlzP2?=
 =?us-ascii?Q?v9fEKWC6XjnlckSpHXGwehmHwngMdJLc6qGqKksbyyI+PlqVYHk5UqmNV9qX?=
 =?us-ascii?Q?k634YxI+ZhrdT8+5+VMjKCNCtfQbcQJuLUUKl6wgbEdYV1EaVd1w6djEnKUE?=
 =?us-ascii?Q?paxJKG/IHBjce2VG62QBWeOmxxcsU7UI+N6N92nwWbgBYzlF8i7ZuA0qhQsZ?=
 =?us-ascii?Q?bbG4L5mek0KZx/5FRspSIJvWsJIJAgvr906AFMLdA/iqaTxSVG9GvBdn0MJZ?=
 =?us-ascii?Q?SLMkS5J6By7Mr9D7djYuk9q+OkQwFtg3o5quVW0WLXbDyEuPD1Qyg/dIZJLe?=
 =?us-ascii?Q?ubmOFCjtHky+X4ieJkruv9jNEGDeoXIF2UHDwqHlc6vTj1pGyxMeVsqJ0KtU?=
 =?us-ascii?Q?PVHuVy/S2DFJrbH0/CyCzkipbmRLWx95FkLzxi0p4dHm40qmuI6NAjSK+Grv?=
 =?us-ascii?Q?PxH8pVny5PWJF5xY/ZwVcuL57FpcSD9dQhnKCvAr?=
X-OriginatorOrg: nxp.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c62a6fa8-8413-4754-462e-08da8f436718
X-MS-Exchange-CrossTenant-AuthSource: DU2PR04MB8630.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2022 13:34:48.4084
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /t53ulBEvc7aX5ySqM17PIsDpdbnrCydaGOBVaTydeHUhpI/HCl3KAnG74aU3B38dyz/uA9SyBL9Mhay169tyQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR04MB5585
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE,
        RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,SPF_PASS,T_SCC_BODY_TEXT_LINE
        autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Two changes are done:
- new cmd line option "hw" needs to be suffix, to generate the
  hw bound key.
  for ex:
   $:> keyctl add trusted <KEYNAME> 'new 32 hw' @s
   $:> keyctl add trusted <KEYNAME> 'load $(cat <KEY_BLOB_FILE_NAME>) hw' @s

- For "new", generating the hw bounded trusted key, updating the input key
  length as part of seal operation as well.

Signed-off-by: Pankaj Gupta <pankaj.gupta@nxp.com>
---
 include/keys/trusted-type.h               |  2 ++
 security/keys/trusted-keys/trusted_caam.c |  6 ++++++
 security/keys/trusted-keys/trusted_core.c | 14 ++++++++++++++
 3 files changed, 22 insertions(+)

diff --git a/include/keys/trusted-type.h b/include/keys/trusted-type.h
index 4eb64548a74f..064266b936c7 100644
--- a/include/keys/trusted-type.h
+++ b/include/keys/trusted-type.h
@@ -22,6 +22,7 @@
 #define MAX_BLOB_SIZE			512
 #define MAX_PCRINFO_SIZE		64
 #define MAX_DIGEST_SIZE			64
+#define HW_BOUND_KEY                    1
 
 struct trusted_key_payload {
 	struct rcu_head rcu;
@@ -29,6 +30,7 @@ struct trusted_key_payload {
 	unsigned int blob_len;
 	unsigned char migratable;
 	unsigned char old_format;
+	unsigned char is_hw_bound;
 	unsigned char key[MAX_KEY_SIZE + 1];
 	unsigned char blob[MAX_BLOB_SIZE];
 };
diff --git a/security/keys/trusted-keys/trusted_caam.c b/security/keys/trusted-keys/trusted_caam.c
index e3415c520c0a..fceb9a271c4d 100644
--- a/security/keys/trusted-keys/trusted_caam.c
+++ b/security/keys/trusted-keys/trusted_caam.c
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
  * Copyright (C) 2021 Pengutronix, Ahmad Fatoum <kernel@pengutronix.de>
+ * Copyright 2022 NXP, Pankaj Gupta <pankaj.gupta@nxp.com>
  */
 
 #include <keys/trusted_caam.h>
@@ -23,6 +24,7 @@ static int trusted_caam_seal(struct trusted_key_payload *p, char *datablob)
 		.input  = p->key,  .input_len   = p->key_len,
 		.output = p->blob, .output_len  = MAX_BLOB_SIZE,
 		.key_mod = KEYMOD, .key_mod_len = sizeof(KEYMOD) - 1,
+		.is_hw_bound = p->is_hw_bound,
 	};
 
 	ret = caam_encap_blob(blobifier, &info);
@@ -30,6 +32,9 @@ static int trusted_caam_seal(struct trusted_key_payload *p, char *datablob)
 		return ret;
 
 	p->blob_len = info.output_len;
+	if (p->is_hw_bound)
+		p->key_len = info.input_len;
+
 	return 0;
 }
 
@@ -40,6 +45,7 @@ static int trusted_caam_unseal(struct trusted_key_payload *p, char *datablob)
 		.input   = p->blob,  .input_len  = p->blob_len,
 		.output  = p->key,   .output_len = MAX_KEY_SIZE,
 		.key_mod = KEYMOD,  .key_mod_len = sizeof(KEYMOD) - 1,
+		.is_hw_bound = p->is_hw_bound,
 	};
 
 	ret = caam_decap_blob(blobifier, &info);
diff --git a/security/keys/trusted-keys/trusted_core.c b/security/keys/trusted-keys/trusted_core.c
index c6fc50d67214..7f7cc2551b92 100644
--- a/security/keys/trusted-keys/trusted_core.c
+++ b/security/keys/trusted-keys/trusted_core.c
@@ -79,6 +79,8 @@ static int datablob_parse(char **datablob, struct trusted_key_payload *p)
 	int key_cmd;
 	char *c;
 
+	p->is_hw_bound = !HW_BOUND_KEY;
+
 	/* main command */
 	c = strsep(datablob, " \t");
 	if (!c)
@@ -94,6 +96,12 @@ static int datablob_parse(char **datablob, struct trusted_key_payload *p)
 		if (ret < 0 || keylen < MIN_KEY_SIZE || keylen > MAX_KEY_SIZE)
 			return -EINVAL;
 		p->key_len = keylen;
+		/* second argument is to determine if tied to HW */
+		c = strsep(datablob, " \t");
+		if (c) {
+			if (strcmp(c, "hw") == 0)
+				p->is_hw_bound = HW_BOUND_KEY;
+		}
 		ret = Opt_new;
 		break;
 	case Opt_load:
@@ -107,6 +115,12 @@ static int datablob_parse(char **datablob, struct trusted_key_payload *p)
 		ret = hex2bin(p->blob, c, p->blob_len);
 		if (ret < 0)
 			return -EINVAL;
+		/* second argument is to determine if tied to HW */
+		c = strsep(datablob, " \t");
+		if (c) {
+			if (strcmp(c, "hw") == 0)
+				p->is_hw_bound = HW_BOUND_KEY;
+		}
 		ret = Opt_load;
 		break;
 	case Opt_update:
-- 
2.17.1