From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754063AbdEDO4q (ORCPT ); Thu, 4 May 2017 10:56:46 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34123 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753336AbdEDO4j (ORCPT ); Thu, 4 May 2017 10:56:39 -0400 From: Stefan Berger To: tpmdd-devel@lists.sourceforge.net, linux-security-module@vger.kernel.org, jarkko.sakkinen@linux.intel.com Cc: jgunthorpe@obsidianresearch.com, linux-kernel@vger.kernel.org, Stefan Berger Subject: [PATCH v3 3/3] tpm: vtpm_proxy: Add flag for ioctl to request locality prepended to command Date: Thu, 4 May 2017 10:56:27 -0400 X-Mailer: git-send-email 2.5.5 In-Reply-To: <1493909787-1848-1-git-send-email-stefanb@linux.vnet.ibm.com> References: <1493909787-1848-1-git-send-email-stefanb@linux.vnet.ibm.com> X-TM-AS-GCONF: 00 x-cbid: 17050414-0040-0000-0000-00000331DB3D X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00007021; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000209; SDB=6.00856174; UDB=6.00423812; IPR=6.00635338; BA=6.00005326; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00015303; XFM=3.00000014; UTC=2017-05-04 14:56:35 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17050414-0041-0000-0000-00000725FD63 Message-Id: <1493909787-1848-4-git-send-email-stefanb@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-05-04_09:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1703280000 definitions=main-1705040237 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For some TPM commands it is necessary that a TPM emulator knows the locality in which the command is executed. To support conveying the locality to the emulator, we implement a flag VTPM_PROXY_FLAG_PREPEND_LOCALITY for the vtpm_proxy driver's VTPM_PROXY_IOC_NEW_DEV ioctl to request that the locality be prepended to every TPM command. This flag is also set in the VTPM_PROXY_IOC_GET_SUPT_FLAGS ioctl's flags field to indicate that this feature is supported in this version of the driver. Signed-off-by: Stefan Berger --- drivers/char/tpm/tpm_vtpm_proxy.c | 18 ++++++++++++++---- include/uapi/linux/vtpm_proxy.h | 6 ++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c index 48b9818..e45dd33 100644 --- a/drivers/char/tpm/tpm_vtpm_proxy.c +++ b/drivers/char/tpm/tpm_vtpm_proxy.c @@ -52,7 +52,8 @@ struct proxy_dev { }; /* all supported flags */ -#define VTPM_PROXY_FLAGS_ALL (VTPM_PROXY_FLAG_TPM2) +#define VTPM_PROXY_FLAGS_ALL (VTPM_PROXY_FLAG_TPM2 | \ + VTPM_PROXY_FLAG_PREPEND_LOCALITY) static struct workqueue_struct *workqueue; @@ -78,7 +79,10 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf, { struct proxy_dev *proxy_dev = filp->private_data; size_t len; - int sig, rc; + int sig; + int rc = 0; + size_t offset = 0; + uint8_t locality; sig = wait_event_interruptible(proxy_dev->wq, proxy_dev->req_len != 0 || @@ -102,7 +106,13 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf, return -EIO; } - rc = copy_to_user(buf, proxy_dev->buffer, len); + if (proxy_dev->flags & VTPM_PROXY_FLAG_PREPEND_LOCALITY) { + locality = proxy_dev->chip->locality; + offset = sizeof(locality); + rc = copy_to_user(buf, &locality, offset); + } + if (!rc) + rc = copy_to_user(&buf[offset], proxy_dev->buffer, len); memset(proxy_dev->buffer, 0, len); proxy_dev->req_len = 0; @@ -114,7 +124,7 @@ static ssize_t vtpm_proxy_fops_read(struct file *filp, char __user *buf, if (rc) return -EFAULT; - return len; + return offset + len; } /** diff --git a/include/uapi/linux/vtpm_proxy.h b/include/uapi/linux/vtpm_proxy.h index 83e64e7..ce76f0c 100644 --- a/include/uapi/linux/vtpm_proxy.h +++ b/include/uapi/linux/vtpm_proxy.h @@ -21,10 +21,12 @@ /** * enum vtpm_proxy_flags - flags for the proxy TPM - * @VTPM_PROXY_FLAG_TPM2: the proxy TPM uses TPM 2.0 protocol + * @VTPM_PROXY_FLAG_TPM2: the proxy TPM uses TPM 2.0 protocol + * @VTPM_PROXY_FLAG_PREPEND_LOCALITY: locality byte prepended on each command */ enum vtpm_proxy_flags { - VTPM_PROXY_FLAG_TPM2 = 1, + VTPM_PROXY_FLAG_TPM2 = 1, + VTPM_PROXY_FLAG_PREPEND_LOCALITY = 2, }; /** -- 2.4.3