x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
Jarkko Sakkinen
maintainerPATCH 1/1 x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
The length documented as
* @length: length of the data (multiple of the page size)
Fail with -EINVAL, when user gives a zero length buffer. Right now 'ret' is returned as uninitialized.
--- arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/ioctl.c +1 -1
@@ -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)
Signature · 1 line
2.27.0
The following commit has been merged into the x86/sgx branch of tip:
The following commit has been merged into the x86/sgx branch of tip:
Commit-ID: a4b9c48b96517ff4780b22a784e7537eac5dc21b Gitweb: https://git.kernel.org/tip/a4b9c48b96517ff4780b22a784e7537eac5dc21b Author: Jarkko Sakkinen <[email protected]> AuthorDate: Thu, 03 Dec 2020 20:35:27 +02:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 03 Dec 2020 19:54:40 +01:00
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. ]
--- arch/x86/kernel/cpu/sgx/ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/kernel/cpu/sgx/ioctl.c +1 -1
@@ -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)
Quoted 7 lines · Jarkko Sakkinen
The length documented as
* @length: length of the data (multiple of the page size)
Fail with
-EINVAL, when user gives a zero length buffer. Right now 'ret' is returned as uninitialized.
Quoted 6 lines
Cc Dave Hansen <[email protected]>Cc Borislav Petkov <[email protected]>Fixes c6d26d370767 ("x86/sgx: Add SGX_IOC_ENCLAVE_ADD_PAGES")Reported-by Dan Carpenter <[email protected]>Signed-off-by Jarkko Sakkinen <[email protected]>
regards,
dan carpenter