From patchwork Thu May 4 14:56:25 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Berger X-Patchwork-Id: 9712109 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 097B960387 for ; Thu, 4 May 2017 14:57:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EDA0A1FF22 for ; Thu, 4 May 2017 14:57:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E27AD28694; Thu, 4 May 2017 14:57:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 75FF62868C for ; Thu, 4 May 2017 14:57:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754408AbdEDO50 (ORCPT ); Thu, 4 May 2017 10:57:26 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:34000 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753506AbdEDO4f (ORCPT ); Thu, 4 May 2017 10:56:35 -0400 Received: from pps.filterd (m0098396.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.20/8.16.0.20) with SMTP id v44EuJJu138984 for ; Thu, 4 May 2017 10:56:34 -0400 Received: from e12.ny.us.ibm.com (e12.ny.us.ibm.com [129.33.205.202]) by mx0a-001b2d01.pphosted.com with ESMTP id 2a86ge00d7-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Thu, 04 May 2017 10:56:34 -0400 Received: from localhost by e12.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 4 May 2017 10:56:33 -0400 Received: from b01cxnp22033.gho.pok.ibm.com (9.57.198.23) by e12.ny.us.ibm.com (146.89.104.199) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Thu, 4 May 2017 10:56:31 -0400 Received: from b01ledav002.gho.pok.ibm.com (b01ledav002.gho.pok.ibm.com [9.57.199.107]) by b01cxnp22033.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id v44EuSmv44630046; Thu, 4 May 2017 14:56:31 GMT Received: from b01ledav002.gho.pok.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CA97C124062; Thu, 4 May 2017 10:56:25 -0400 (EDT) Received: from sbct-3.watson.ibm.com (unknown [9.2.141.158]) by b01ledav002.gho.pok.ibm.com (Postfix) with ESMTP id A9CA1124055; Thu, 4 May 2017 10:56:25 -0400 (EDT) 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 1/3] tpm: vtpm_proxy: Implement new ioctl to get supported flags Date: Thu, 4 May 2017 10:56:25 -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-0048-0000-0000-00000176E7A6 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.00635337; 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:32 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 17050414-0049-0000-0000-000040FE1301 Message-Id: <1493909787-1848-2-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: owner-linux-security-module@vger.kernel.org Precedence: bulk List-ID: X-Virus-Scanned: ClamAV using ClamSMTP Implement VTPM_PROXY_IOC_GET_SUPT_FLAGS ioctl to get the bitmask of flags that the vtpm_proxy driver supports in the VTPM_PROXY_IOC_NEW_DEV ioctl. This helps user space in deciding which flags to set in that ioctl. Signed-off-by: Stefan Berger --- drivers/char/tpm/tpm_vtpm_proxy.c | 29 +++++++++++++++++++++++++++++ include/uapi/linux/vtpm_proxy.h | 11 +++++++++++ 2 files changed, 40 insertions(+) diff --git a/drivers/char/tpm/tpm_vtpm_proxy.c b/drivers/char/tpm/tpm_vtpm_proxy.c index 751059d..fb4d207 100644 --- a/drivers/char/tpm/tpm_vtpm_proxy.c +++ b/drivers/char/tpm/tpm_vtpm_proxy.c @@ -592,6 +592,33 @@ static long vtpmx_ioc_new_dev(struct file *file, unsigned int ioctl, return 0; } +/** + * vtpmx_ioc_get_supt_flags - handler for the %VTPM_PROXY_IOC_GET_SUPT_FLAGS + * ioctl + * @file: /dev/vtpmx + * @ioctl: the ioctl number + * @arg: pointer to the struct vtpmx_proxy_get_supt_flags + * + * Return the bitfield of supported flags + */ +static long vtpmx_ioc_get_supt_flags(struct file *file, unsigned int ioctl, + unsigned long arg) +{ + void __user *argp = (void __user *)arg; + struct vtpm_proxy_supt_flags __user *vtpm_supt_flags_p = argp; + struct vtpm_proxy_supt_flags flags = { + .flags = VTPM_PROXY_FLAGS_ALL, + }; + + if (!capable(CAP_SYS_ADMIN)) + return -EPERM; + + if (copy_to_user(vtpm_supt_flags_p, &flags, sizeof(flags))) + return -EFAULT; + + return 0; +} + /* * vtpmx_fops_ioctl: ioctl on /dev/vtpmx * @@ -604,6 +631,8 @@ static long vtpmx_fops_ioctl(struct file *f, unsigned int ioctl, switch (ioctl) { case VTPM_PROXY_IOC_NEW_DEV: return vtpmx_ioc_new_dev(f, ioctl, arg); + case VTPM_PROXY_IOC_GET_SUPT_FLAGS: + return vtpmx_ioc_get_supt_flags(f, ioctl, arg); default: return -ENOIOCTLCMD; } diff --git a/include/uapi/linux/vtpm_proxy.h b/include/uapi/linux/vtpm_proxy.h index a69e991..83e64e7 100644 --- a/include/uapi/linux/vtpm_proxy.h +++ b/include/uapi/linux/vtpm_proxy.h @@ -44,6 +44,17 @@ struct vtpm_proxy_new_dev { __u32 minor; /* output */ }; +/** + * struct vtpm_proxy_supt_flags - parameter structure for the + * %VTPM_PROXY_IOC_GET_SUPT_FLAGS ioctl + * @flags: flags supported by the vtpm proxy driver + */ +struct vtpm_proxy_supt_flags { + __u32 flags; /* output */ +}; + #define VTPM_PROXY_IOC_NEW_DEV _IOWR(0xa1, 0x00, struct vtpm_proxy_new_dev) +#define VTPM_PROXY_IOC_GET_SUPT_FLAGS \ + _IOR(0xa1, 0x01, struct vtpm_proxy_supt_flags) #endif /* _UAPI_LINUX_VTPM_PROXY_H */