drivers: optee: rpmb: fix returning CID to TEE
Subsystems (2)
PATCH 1/1 drivers: optee: rpmb: fix returning CID to TEE
The mmc CID value is one of the input parameters used to provision the RPMB key. The trusted execution environment expects this value to be specified in big endian format.
Before this fix, on little endian systems, the value returned by the linux kernel mmc driver differed from the one returned by u-boot. This meant that if linux provisioned the RPMB key, u-boot would not have access to the partition (and the other way around).
--- drivers/tee/optee/rpmb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/tee/optee/rpmb.c +4 -1
@@ -98,6 +98,7 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id)static u32 rpmb_get_dev_info (u16 dev_id,struct rpmb_dev_info *info) {struct mmc *mmc =find_mmc_device (dev_id); +int i;if (!mmc)return TEE_ERROR_ITEM_NOT_FOUND ;
@@ -105,7 +106,9 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)if (!mmc->ext_csd)return TEE_ERROR_GENERIC ; -memcpy (info->cid, mmc->cid,sizeof (info->cid)); +for (i =0 ; i <ARRAY_SIZE (mmc->cid); i++) + ((u32 *) info->cid)[i] =cpu_to_be32 (mmc->cid[i]); + info->rel_wr_sec_c = mmc->ext_csd[222 ]; info->rpmb_size_mult = mmc->ext_csd[168 ]; info->ret_code =RPMB_CMD_GET_DEV_INFO_RET_OK ;
Signature · 1 line
2.17.1
PATCH 1/1 drivers: optee: rpmb: fix returning CID to TEE
Quoted 10 lines · Jorge Ramirez-Ortiz
The mmc CID value is one of the input parameters used to provision the RPMB key. The trusted execution environment expects this value to be specified in big endian format.
Before this fix, on little endian systems, the value returned by the linux kernel mmc driver differed from the one returned by u-boot. This meant that if linux provisioned the RPMB key, u-boot would not have access to the partition (and the other way around).
Signed-off-by Jorge Ramirez-Ortiz <[email protected]>
Looks good to me:
Thanks,
Jens
Quoted 30 lines
--- drivers/tee/optee/rpmb.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/tee/optee/rpmb.c +4
-1@@ -98,6 +98,7 @@ static struct mmc *get_mmc(struct optee_private *priv, int dev_id)static u32 rpmb_get_dev_info (u16 dev_id,struct rpmb_dev_info *info) {struct mmc *mmc =find_mmc_device (dev_id); +int i;if (!mmc)return TEE_ERROR_ITEM_NOT_FOUND ;@@ -105,7 +106,9 @@ static u32 rpmb_get_dev_info(u16 dev_id, struct rpmb_dev_info *info)if (!mmc->ext_csd)return TEE_ERROR_GENERIC ; -memcpy (info->cid, mmc->cid,sizeof (info->cid)); +for (i =0 ; i <ARRAY_SIZE (mmc->cid); i++) + ((u32 *) info->cid)[i] =cpu_to_be32 (mmc->cid[i]); + info->rel_wr_sec_c = mmc->ext_csd[222 ]; info->rpmb_size_mult = mmc->ext_csd[168 ]; info->ret_code =RPMB_CMD_GET_DEV_INFO_RET_OK ;Signature · 1 line
2.17.1
PATCH 1/1 drivers: optee: rpmb: fix returning CID to TEE
In reply to Jorge Ramirez-OrtizQuoted 11 lines · Jorge Ramirez-Ortiz
The mmc CID value is one of the input parameters used to provision the RPMB key. The trusted execution environment expects this value to be specified in big endian format.
Before this fix, on little endian systems, the value returned by the linux kernel mmc driver differed from the one returned by u-boot. This meant that if linux provisioned the RPMB key, u-boot would not have access to the partition (and the other way around).
Signed-off-by Jorge Ramirez-Ortiz <[email protected]>Reviewed-by Jens Wiklander <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 833 bytes Desc: not available URL: <https://lists.denx.de/pipermail/u-boot/attachments/20191205/46b46695/attachment.sig>