From nobody Wed Dec 17 08:52:18 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id D75A8EE49AA for ; Tue, 22 Aug 2023 11:29:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234719AbjHVL3w (ORCPT ); Tue, 22 Aug 2023 07:29:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44762 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234178AbjHVL3v (ORCPT ); Tue, 22 Aug 2023 07:29:51 -0400 Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 67865CD2 for ; Tue, 22 Aug 2023 04:29:48 -0700 (PDT) Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-68a410316a2so1426972b3a.0 for ; Tue, 22 Aug 2023 04:29:48 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1692703788; x=1693308588; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=szLSlXd58emzvGh8mLFeeSOG7azUQ2dbDCLE1VrpSi8=; b=MNVyX++Pi1Qqq5D2G2XGu2193X1/nJCr3llMVnAasCgdp1Y3KXWhDwOas9WrhPkgiR kYsBD/GDVik/F40EF2Kaqm1YlN9AcZDK7m+JxHbGyBUI3vvmNNQ8P+z27boXH5ke3726 CrUoYxIwGiIx+9ZZpJdiZBGjIkTQulITi8+m97rj+IaFZhmgWyqb9KDF59MobvT+jwaT BDLQLAI3+OPuCA5uxSZVD1Zm4eMvbkViwSaEuZ5/NB04eVSIhHwhA9ITC5aTVeLm6C2+ 1YlPwIecnhWEqcuYr3qAsXecLa73yey8c46Yl5N/kKOUBA99nV/TSRUPJBiDI8prFg44 b8GQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692703788; x=1693308588; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=szLSlXd58emzvGh8mLFeeSOG7azUQ2dbDCLE1VrpSi8=; b=XvDSl12ZsWC7pgmgjXydw16z7su4t3ZM4Auxn5v57+zu0r+VapNpUD+P18ksNDThwX xOY5TUacz7ozOLa2QfwMwOdcP277cSg3vRj3VGGfySn2ikHmCUrdvhe7MWiKB3Mk0WUn +CQnpR+N5imOk0kIh9M7psqF2r0POWf658G80z4Zyd0uoZL9uj9FM/x4SbENDh60tn1Z u3avGWazTkzmmrKbsh7gkvVAhlC7fjYgO2DkWFSruTWnP4ogpJyYMYrqQ/yaqogEIDkg JDhhDgR9nf2yutfdQXDBmvNgHJqJdBJmUc9T7Z0jnmqRyIDV5zPTbC/WD6GbbhOpvKyN 8/RA== X-Gm-Message-State: AOJu0Yx0ntNom4JLk4YF3PX8/CApqy+fK1Lhm5qqFcMGW1uZ8VXy2WjH AZIhXnIEcgT5D7DP98y3+/H0dA== X-Google-Smtp-Source: AGHT+IFLudj39a+9uK4O+uYImTS+YlROqQRgNV0sWtoLRFSsiWqKOuO3x1yGdd17axNIUd9KOE8JJw== X-Received: by 2002:a05:6a00:1a88:b0:686:2b60:3348 with SMTP id e8-20020a056a001a8800b006862b603348mr7632147pfv.21.1692703787790; Tue, 22 Aug 2023 04:29:47 -0700 (PDT) Received: from sumit-X1.. ([223.178.211.170]) by smtp.gmail.com with ESMTPSA id k26-20020aa792da000000b006878cc942f1sm7657984pfa.54.2023.08.22.04.29.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Aug 2023 04:29:47 -0700 (PDT) From: Sumit Garg To: linux-integrity@vger.kernel.org, keyrings@vger.kernel.org Cc: jarkko@kernel.org, jejb@linux.ibm.com, zohar@linux.ibm.com, jens.wiklander@linaro.org, sudeep.holla@arm.com, achin.gupta@arm.com, linux-security-module@vger.kernel.org, linux-kernel@vger.kernel.org, Sumit Garg Subject: [PATCH] KEYS: trusted: tee: Refactor register SHM usage Date: Tue, 22 Aug 2023 16:59:33 +0530 Message-Id: <20230822112933.1550062-1-sumit.garg@linaro.org> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The OP-TEE driver using the old SMC based ABI permits overlapping shared buffers, but with the new FF-A based ABI each physical page may only be registered once. As the key and blob buffer are allocated adjancently, there is no need for redundant register shared memory invocation. Also, it is incompatibile with FF-A based ABI limitation. So refactor register shared memory implementation to use only single invocation to register both key and blob buffers. Fixes: 4615e5a34b95 ("optee: add FF-A support") Reported-by: Jens Wiklander Signed-off-by: Sumit Garg Reviewed-by: Jens Wiklander Tested-by: Jens Wiklander --- security/keys/trusted-keys/trusted_tee.c | 64 ++++++++---------------- 1 file changed, 20 insertions(+), 44 deletions(-) diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trust= ed-keys/trusted_tee.c index ac3e270ade69..aa3d477de6db 100644 --- a/security/keys/trusted-keys/trusted_tee.c +++ b/security/keys/trusted-keys/trusted_tee.c @@ -65,24 +65,16 @@ static int trusted_tee_seal(struct trusted_key_payload = *p, char *datablob) int ret; struct tee_ioctl_invoke_arg inv_arg; struct tee_param param[4]; - struct tee_shm *reg_shm_in =3D NULL, *reg_shm_out =3D NULL; + struct tee_shm *reg_shm =3D NULL; =20 memset(&inv_arg, 0, sizeof(inv_arg)); memset(¶m, 0, sizeof(param)); =20 - reg_shm_in =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, - p->key_len); - if (IS_ERR(reg_shm_in)) { - dev_err(pvt_data.dev, "key shm register failed\n"); - return PTR_ERR(reg_shm_in); - } - - reg_shm_out =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, - sizeof(p->blob)); - if (IS_ERR(reg_shm_out)) { - dev_err(pvt_data.dev, "blob shm register failed\n"); - ret =3D PTR_ERR(reg_shm_out); - goto out; + reg_shm =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, + sizeof(p->key) + sizeof(p->blob)); + if (IS_ERR(reg_shm)) { + dev_err(pvt_data.dev, "shm register failed\n"); + return PTR_ERR(reg_shm); } =20 inv_arg.func =3D TA_CMD_SEAL; @@ -90,13 +82,13 @@ static int trusted_tee_seal(struct trusted_key_payload = *p, char *datablob) inv_arg.num_params =3D 4; =20 param[0].attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT; - param[0].u.memref.shm =3D reg_shm_in; + param[0].u.memref.shm =3D reg_shm; param[0].u.memref.size =3D p->key_len; param[0].u.memref.shm_offs =3D 0; param[1].attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT; - param[1].u.memref.shm =3D reg_shm_out; + param[1].u.memref.shm =3D reg_shm; param[1].u.memref.size =3D sizeof(p->blob); - param[1].u.memref.shm_offs =3D 0; + param[1].u.memref.shm_offs =3D sizeof(p->key); =20 ret =3D tee_client_invoke_func(pvt_data.ctx, &inv_arg, param); if ((ret < 0) || (inv_arg.ret !=3D 0)) { @@ -107,11 +99,7 @@ static int trusted_tee_seal(struct trusted_key_payload = *p, char *datablob) p->blob_len =3D param[1].u.memref.size; } =20 -out: - if (reg_shm_out) - tee_shm_free(reg_shm_out); - if (reg_shm_in) - tee_shm_free(reg_shm_in); + tee_shm_free(reg_shm); =20 return ret; } @@ -124,24 +112,16 @@ static int trusted_tee_unseal(struct trusted_key_payl= oad *p, char *datablob) int ret; struct tee_ioctl_invoke_arg inv_arg; struct tee_param param[4]; - struct tee_shm *reg_shm_in =3D NULL, *reg_shm_out =3D NULL; + struct tee_shm *reg_shm =3D NULL; =20 memset(&inv_arg, 0, sizeof(inv_arg)); memset(¶m, 0, sizeof(param)); =20 - reg_shm_in =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->blob, - p->blob_len); - if (IS_ERR(reg_shm_in)) { - dev_err(pvt_data.dev, "blob shm register failed\n"); - return PTR_ERR(reg_shm_in); - } - - reg_shm_out =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, - sizeof(p->key)); - if (IS_ERR(reg_shm_out)) { - dev_err(pvt_data.dev, "key shm register failed\n"); - ret =3D PTR_ERR(reg_shm_out); - goto out; + reg_shm =3D tee_shm_register_kernel_buf(pvt_data.ctx, p->key, + sizeof(p->key) + sizeof(p->blob)); + if (IS_ERR(reg_shm)) { + dev_err(pvt_data.dev, "shm register failed\n"); + return PTR_ERR(reg_shm); } =20 inv_arg.func =3D TA_CMD_UNSEAL; @@ -149,11 +129,11 @@ static int trusted_tee_unseal(struct trusted_key_payl= oad *p, char *datablob) inv_arg.num_params =3D 4; =20 param[0].attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT; - param[0].u.memref.shm =3D reg_shm_in; + param[0].u.memref.shm =3D reg_shm; param[0].u.memref.size =3D p->blob_len; - param[0].u.memref.shm_offs =3D 0; + param[0].u.memref.shm_offs =3D sizeof(p->key); param[1].attr =3D TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT; - param[1].u.memref.shm =3D reg_shm_out; + param[1].u.memref.shm =3D reg_shm; param[1].u.memref.size =3D sizeof(p->key); param[1].u.memref.shm_offs =3D 0; =20 @@ -166,11 +146,7 @@ static int trusted_tee_unseal(struct trusted_key_paylo= ad *p, char *datablob) p->key_len =3D param[1].u.memref.size; } =20 -out: - if (reg_shm_out) - tee_shm_free(reg_shm_out); - if (reg_shm_in) - tee_shm_free(reg_shm_in); + tee_shm_free(reg_shm); =20 return ret; } --=20 2.34.1