From patchwork Sun Dec 4 18:40:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jarkko Sakkinen X-Patchwork-Id: 9460103 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 CC66460231 for ; Sun, 4 Dec 2016 18:41:15 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C22372465D for ; Sun, 4 Dec 2016 18:41:15 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id B709624B91; Sun, 4 Dec 2016 18:41:15 +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=-1.9 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from ml01.01.org (ml01.01.org [198.145.21.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7874A2465D for ; Sun, 4 Dec 2016 18:41:15 +0000 (UTC) Received: from [127.0.0.1] (localhost [IPv6:::1]) by ml01.01.org (Postfix) with ESMTP id 8E96A81FC3 for ; Sun, 4 Dec 2016 10:41:15 -0800 (PST) X-Original-To: intel-sgx-kernel-dev@lists.01.org Delivered-To: intel-sgx-kernel-dev@lists.01.org Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 5113B81FC3 for ; Sun, 4 Dec 2016 10:41:14 -0800 (PST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by orsmga104.jf.intel.com with ESMTP; 04 Dec 2016 10:41:13 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,743,1477983600"; d="scan'208"; a="1077332999" Received: from jcortizr-mobl1.ger.corp.intel.com (HELO localhost) ([10.252.2.177]) by fmsmga001.fm.intel.com with ESMTP; 04 Dec 2016 10:41:12 -0800 From: Jarkko Sakkinen To: intel-sgx-kernel-dev@lists.01.org Date: Sun, 4 Dec 2016 20:40:40 +0200 Message-Id: <20161204184044.21031-5-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20161204184044.21031-1-jarkko.sakkinen@linux.intel.com> References: <20161204184044.21031-1-jarkko.sakkinen@linux.intel.com> Subject: [intel-sgx-kernel-dev] [PATCH v6 4/8] intel_sgx: fix error resolution in SGX_IOC_ENCLAVE_INIT X-BeenThere: intel-sgx-kernel-dev@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Project: Intel® Software Guard Extensions for Linux*: https://01.org/intel-software-guard-extensions" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-sgx-kernel-dev-bounces@lists.01.org Sender: "intel-sgx-kernel-dev" X-Virus-Scanned: ClamAV using ClamSMTP From: Sean Christopherson The ioctl now always return -EBUSY when something fails. This is not a good idea because it advices the user space always to retry. This commit changes the error resolution in a way that the default error code is instead -EFAULT. Only in the case of SGX_UNMASKED_EVENT (after several retries of EINIT) we will return -EBUSY. We also change the ioctl to return -EPERM when the sigstruct is not properly authenticated. [jarkko.sakkinen@linux.intel.com: updated patch to return EPERM and rewrote the commit message to properly explain the problem statement and the solution.] Signed-off-by: Sean Christopherson Reviewed-by: Jarkko Sakkinen Tested-by: Jarkko Sakkinen --- drivers/platform/x86/intel_sgx_ioctl.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/platform/x86/intel_sgx_ioctl.c b/drivers/platform/x86/intel_sgx_ioctl.c index db17b9f..b377200 100644 --- a/drivers/platform/x86/intel_sgx_ioctl.c +++ b/drivers/platform/x86/intel_sgx_ioctl.c @@ -824,7 +824,22 @@ static int __sgx_encl_init(struct sgx_encl *encl, char *sigstruct, out: if (ret) { sgx_dbg(encl, "EINIT returned %d\n", ret); - ret = -EBUSY; + switch (ret) { + case SGX_UNMASKED_EVENT: + ret = -EBUSY; + break; + case SGX_INVALID_SIG_STRUCT: + case SGX_INVALID_ATTRIBUTE: + case SGX_INVALID_MEASUREMENT: + case SGX_INVALID_SIGNATURE: + case SGX_INVALID_LICENSE: + case SGX_INVALID_CPUSVN: + ret = -EPERM; + break; + default: + ret = -EFAULT; + break; + } } else { encl->flags |= SGX_ENCL_INITIALIZED;