diff options
| author | Jarkko Sakkinen <jarkko@kernel.org> | 2020-12-03 20:35:27 +0200 |
|---|---|---|
| committer | Borislav Petkov <bp@suse.de> | 2020-12-03 19:54:40 +0100 |
| commit | a4b9c48b96517ff4780b22a784e7537eac5dc21b (patch) | |
| tree | 1e78a3ec15ba27f70d1adeaac27d2271592b109f /arch/x86/kernel/cpu/sgx/ioctl.c | |
| parent | bab8c183d1d452f5fdc059aef2f0788bd2986231 (diff) | |
| download | linux-stable-a4b9c48b96517ff4780b22a784e7537eac5dc21b.tar.gz linux-stable-a4b9c48b96517ff4780b22a784e7537eac5dc21b.tar.bz2 linux-stable-a4b9c48b96517ff4780b22a784e7537eac5dc21b.zip | |
x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
The sgx_enclave_add_pages.length field is documented as
* @length: length of the data (multiple of the page size)
Fail with -EINVAL, when the caller gives a zero length buffer of data
to be added as pages to an enclave. Right now 'ret' is returned as
uninitialized in that case.
[ bp: Flesh out commit message. ]
Fixes: c6d26d370767 ("x86/sgx: Add SGX_IOC_ENCLAVE_ADD_PAGES")
Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Link: https://lore.kernel.org/linux-sgx/X8ehQssnslm194ld@mwanda/
Link: https://lkml.kernel.org/r/20201203183527.139317-1-jarkko@kernel.org
Diffstat (limited to 'arch/x86/kernel/cpu/sgx/ioctl.c')
| -rw-r--r-- | arch/x86/kernel/cpu/sgx/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c index c206aee80a04..90a5caf76939 100644 --- a/arch/x86/kernel/cpu/sgx/ioctl.c +++ b/arch/x86/kernel/cpu/sgx/ioctl.c @@ -428,7 +428,7 @@ static long sgx_ioc_enclave_add_pages(struct sgx_encl *encl, void __user *arg) !IS_ALIGNED(add_arg.src, PAGE_SIZE)) return -EINVAL; - if (add_arg.length & (PAGE_SIZE - 1)) + if (!add_arg.length || add_arg.length & (PAGE_SIZE - 1)) return -EINVAL; if (add_arg.offset + add_arg.length - PAGE_SIZE >= encl->size) |