* [PATCH] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
@ 2020-12-03 18:35 Jarkko Sakkinen
2020-12-03 19:25 ` [tip: x86/sgx] " tip-bot2 for Jarkko Sakkinen
2020-12-04 5:19 ` [PATCH] " Dan Carpenter
0 siblings, 2 replies; 3+ messages in thread
From: Jarkko Sakkinen @ 2020-12-03 18:35 UTC (permalink / raw)
To: x86
Cc: linux-kernel, linux-sgx, Jarkko Sakkinen, Dave Hansen,
Borislav Petkov, Dan Carpenter
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.
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: https://lore.kernel.org/linux-sgx/X8ehQssnslm194ld@mwanda/
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>
---
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 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)
--
2.27.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [tip: x86/sgx] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
2020-12-03 18:35 [PATCH] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages() Jarkko Sakkinen
@ 2020-12-03 19:25 ` tip-bot2 for Jarkko Sakkinen
2020-12-04 5:19 ` [PATCH] " Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot2 for Jarkko Sakkinen @ 2020-12-03 19:25 UTC (permalink / raw)
To: linux-tip-commits
Cc: Dan Carpenter, Jarkko Sakkinen, Borislav Petkov, x86, linux-kernel
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 <jarkko@kernel.org>
AuthorDate: Thu, 03 Dec 2020 20:35:27 +02:00
Committer: Borislav Petkov <bp@suse.de>
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. ]
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
---
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 c206aee..90a5caf 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)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages()
2020-12-03 18:35 [PATCH] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages() Jarkko Sakkinen
2020-12-03 19:25 ` [tip: x86/sgx] " tip-bot2 for Jarkko Sakkinen
@ 2020-12-04 5:19 ` Dan Carpenter
1 sibling, 0 replies; 3+ messages in thread
From: Dan Carpenter @ 2020-12-04 5:19 UTC (permalink / raw)
To: Jarkko Sakkinen
Cc: x86, linux-kernel, linux-sgx, Dave Hansen, Borislav Petkov
On Thu, Dec 03, 2020 at 08:35:27PM +0200, Jarkko Sakkinen wrote:
> 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.
>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Link: https://lore.kernel.org/linux-sgx/X8ehQssnslm194ld@mwanda/
> 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>
Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
regards,
dan carpenter
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2020-12-04 5:20 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 18:35 [PATCH] x86/sgx: Return -EINVAL on a zero length buffer in sgx_ioc_enclave_add_pages() Jarkko Sakkinen
2020-12-03 19:25 ` [tip: x86/sgx] " tip-bot2 for Jarkko Sakkinen
2020-12-04 5:19 ` [PATCH] " Dan Carpenter
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).