From patchwork Tue Jun 8 18:26:40 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 455809 Delivered-To: patch@linaro.org Received: by 2002:a02:735a:0:0:0:0:0 with SMTP id a26csp4017370jae; Tue, 8 Jun 2021 11:54:57 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwqcKG9OiLEFz5dCRC5HCL+VNn9h+ZO5k2dcXOqYOQ0G8HTFP/28a/cq8BwPFhLxTK0xtg5 X-Received: by 2002:a17:906:5211:: with SMTP id g17mr25034648ejm.281.1623178497562; Tue, 08 Jun 2021 11:54:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1623178497; cv=none; d=google.com; s=arc-20160816; b=WTqPpXvNPpgr5CKh7Dv65usrWQcCRFiy8cjlvNiBZkPCb+S/Sj7mIfnPjMaNlo0NfZ GZI0nQHPCU1EzRbafjVNNRacKaegNGJNX+Yb4IF6Y9j0jF8FbcpkXUR2FVa7vE4+wlsI UUprb4T6uoV7Vc6uUT7y1INWEtu1ZbHal4k6mlHCNlTNHQZQOWu1Os9ckOOBFhXotywU C+pAnHVp0G5E3PbVoCdjfN34bRL9+QIMGncxY6CY2FKS3FfpcIkvyWhlBaU8+cXSNA1g nAbWjYencdoxvxY+7E7lSoZsK/Nc0UeifZvA7r+7SkpAGYn97tb12xSk3VczgENaHFxB oZhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ixc7SRB0Y4zfaQDzyW7Blog7GxiHT9/SgW+A9AILUR4=; b=PlNt6uIRDvBUAL6b+Ag8+w/o+LuMVaWwUVT3nK6IdNu0YUWMqQWEKzSMMj+bvq6qvg ft02GR7+cw9y3NesMivnzN+e2k3PDHG8QTizeF47c0UdfbodXEm9AUwkUGnZTNXkioLK 8CZdjAca4bKh3BqcflA/SQ1YrVVw6YCXn3RHrZWRH6jAilsqCt1mw6rv01gPkMQYCbhW 2Lwrfl3vxdhYGkMLZrnoz8R4zNRYKhuBUdr7NIAQYKJWBeIlOJz4lEI4l7Gw5McSV9SB bb703UHQYp21V77eP2m5z04RGQSpEPlvd1fzWZFpLV/jVt8t8fWi28zqnZR4vZPtpSiQ PHuw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xbMnnyfg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s18si438417ejh.472.2021.06.08.11.54.57; Tue, 08 Jun 2021 11:54:57 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=xbMnnyfg; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237033AbhFHS4Y (ORCPT + 12 others); Tue, 8 Jun 2021 14:56:24 -0400 Received: from mail.kernel.org ([198.145.29.99]:60140 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236493AbhFHSyY (ORCPT ); Tue, 8 Jun 2021 14:54:24 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 2B68A61438; Tue, 8 Jun 2021 18:41:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1623177680; bh=FTYYrV3cXZVmORehgHmEt8LBqyCBK2QvnCIq38jBZvg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=xbMnnyfgXlWftK9eg3cZpHNysolAHzwEpp0ilDabG8LVqr1skMo7WNcjWT22sgMns JLdO7srijIca41GLFDWlMe4l4l61Zo5Eacpw2/QHJ70B53VnZ3mGI45VUv/6vws5o6 NMjHr0010u1A/SRzWMnaZd0/Y6kpY24w+/55K4Fw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andy Shevchenko , Jens Wiklander , Sasha Levin Subject: [PATCH 5.10 060/137] optee: use export_uuid() to copy client UUID Date: Tue, 8 Jun 2021 20:26:40 +0200 Message-Id: <20210608175944.404659515@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210608175942.377073879@linuxfoundation.org> References: <20210608175942.377073879@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Jens Wiklander [ Upstream commit 673c7aa2436bfc857b92417f3e590a297c586dde ] Prior to this patch optee_open_session() was making assumptions about the internal format of uuid_t by casting a memory location in a parameter struct to uuid_t *. Fix this using export_uuid() to get a well defined binary representation and also add an octets field in struct optee_msg_param in order to avoid casting. Fixes: c5b4312bea5d ("tee: optee: Add support for session login client UUID generation") Suggested-by: Andy Shevchenko Signed-off-by: Jens Wiklander Signed-off-by: Sasha Levin --- drivers/tee/optee/call.c | 6 ++++-- drivers/tee/optee/optee_msg.h | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) -- 2.30.2 diff --git a/drivers/tee/optee/call.c b/drivers/tee/optee/call.c index 780d7c4fd756..0790de29f0ca 100644 --- a/drivers/tee/optee/call.c +++ b/drivers/tee/optee/call.c @@ -217,6 +217,7 @@ int optee_open_session(struct tee_context *ctx, struct optee_msg_arg *msg_arg; phys_addr_t msg_parg; struct optee_session *sess = NULL; + uuid_t client_uuid; /* +2 for the meta parameters added below */ shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg); @@ -237,10 +238,11 @@ int optee_open_session(struct tee_context *ctx, memcpy(&msg_arg->params[0].u.value, arg->uuid, sizeof(arg->uuid)); msg_arg->params[1].u.value.c = arg->clnt_login; - rc = tee_session_calc_client_uuid((uuid_t *)&msg_arg->params[1].u.value, - arg->clnt_login, arg->clnt_uuid); + rc = tee_session_calc_client_uuid(&client_uuid, arg->clnt_login, + arg->clnt_uuid); if (rc) goto out; + export_uuid(msg_arg->params[1].u.octets, &client_uuid); rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param); if (rc) diff --git a/drivers/tee/optee/optee_msg.h b/drivers/tee/optee/optee_msg.h index 7b2d919da2ac..c7ac7d02d6cc 100644 --- a/drivers/tee/optee/optee_msg.h +++ b/drivers/tee/optee/optee_msg.h @@ -9,7 +9,7 @@ #include /* - * This file defines the OP-TEE message protocol used to communicate + * This file defines the OP-TEE message protocol (ABI) used to communicate * with an instance of OP-TEE running in secure world. * * This file is divided into three sections. @@ -146,9 +146,10 @@ struct optee_msg_param_value { * @tmem: parameter by temporary memory reference * @rmem: parameter by registered memory reference * @value: parameter by opaque value + * @octets: parameter by octet string * * @attr & OPTEE_MSG_ATTR_TYPE_MASK indicates if tmem, rmem or value is used in - * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value, + * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value or octets, * OPTEE_MSG_ATTR_TYPE_TMEM_* indicates @tmem and * OPTEE_MSG_ATTR_TYPE_RMEM_* indicates @rmem, * OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used. @@ -159,6 +160,7 @@ struct optee_msg_param { struct optee_msg_param_tmem tmem; struct optee_msg_param_rmem rmem; struct optee_msg_param_value value; + u8 octets[24]; } u; };