From: Sean Christopherson <sean.j.christopherson@intel.com>
To: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
Cc: linux-sgx@vger.kernel.org
Subject: [PATCH for_v31 1/6] x86/sgx: Fix inadvertant early return from sgx_ioctl()
Date: Fri, 29 May 2020 10:54:02 -0700 [thread overview]
Message-ID: <20200529175407.2109-2-sean.j.christopherson@intel.com> (raw)
In-Reply-To: <20200529175407.2109-1-sean.j.christopherson@intel.com>
Set 'ret' instead of returning if the enclave is dead in sgx_ioctl(),
otherwise the goto that was added doesn't take effect.
Signed-off-by: Sean Christopherson <sean.j.christopherson@intel.com>
---
arch/x86/kernel/cpu/sgx/ioctl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index ec5a0f017014b..2019ee1dc0b3e 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -790,7 +790,7 @@ long sgx_ioctl(struct file *filep, unsigned int cmd, unsigned long arg)
return -EBUSY;
if (encl_flags & SGX_ENCL_DEAD) {
- return -EFAULT;
+ ret = -EFAULT;
goto out;
}
--
2.26.0
next prev parent reply other threads:[~2020-05-29 17:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-29 17:54 [PATCH for_v31 0/6] x86/sgx: Misc fixes for v31 Sean Christopherson
2020-05-29 17:54 ` Sean Christopherson [this message]
2020-05-29 17:54 ` [PATCH for_v31 2/6] x86/sgx: Remove unnecessary globals after merging reclaim.c into main.c Sean Christopherson
2020-05-30 8:43 ` Jarkko Sakkinen
2020-05-30 8:47 ` Jarkko Sakkinen
2020-05-30 10:36 ` Jarkko Sakkinen
2020-05-29 17:54 ` [PATCH for_v31 3/6] x86/sgx: Rename sgx_free_page() to sgx_free_epc_page() Sean Christopherson
2020-06-01 0:50 ` Jarkko Sakkinen
2020-05-29 17:54 ` [PATCH for_v31 4/6] x86/sgx: Replace "grab" with "alloc" in VA page helper Sean Christopherson
2020-06-01 0:53 ` Jarkko Sakkinen
2020-05-29 17:54 ` [PATCH for_v31 5/6] x86/sgx: Update stale comment in EPC page allocators Sean Christopherson
2020-06-01 0:59 ` Jarkko Sakkinen
2020-05-29 17:54 ` [PATCH for_v31 6/6] x86/sgx: Drop the message that fires when there are too many EPC sections Sean Christopherson
2020-06-01 1:01 ` Jarkko Sakkinen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200529175407.2109-2-sean.j.christopherson@intel.com \
--to=sean.j.christopherson@intel.com \
--cc=jarkko.sakkinen@linux.intel.com \
--cc=linux-sgx@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).