[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-ID: <166793776319.4906.4394830802759229298.tip-bot2@tip-bot2>
Date: Tue, 08 Nov 2022 20:02:43 -0000
From: tip-bot2 for Borys Popławski
<tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: borysp@...isiblethingslab.com, Borislav Petkov <bp@...e.de>,
Jarkko Sakkinen <jarkko@...nel.org>, stable@...r.kernel.org,
#@...-bot2.tec.linutronix.de, v5.11+@...-bot2.tec.linutronix.de,
x86@...nel.org, linux-kernel@...r.kernel.org
Subject: [tip: x86/urgent] x86/sgx: Add overflow check in sgx_validate_offset_length()
The following commit has been merged into the x86/urgent branch of tip:
Commit-ID: f0861f49bd946ff94fce4f82509c45e167f63690
Gitweb: https://git.kernel.org/tip/f0861f49bd946ff94fce4f82509c45e167f63690
Author: Borys Popławski <borysp@...isiblethingslab.com>
AuthorDate: Wed, 05 Oct 2022 00:59:03 +02:00
Committer: Borislav Petkov <bp@...e.de>
CommitterDate: Tue, 08 Nov 2022 20:34:05 +01:00
x86/sgx: Add overflow check in sgx_validate_offset_length()
sgx_validate_offset_length() function verifies "offset" and "length"
arguments provided by userspace, but was missing an overflow check on
their addition. Add it.
Fixes: c6d26d370767 ("x86/sgx: Add SGX_IOC_ENCLAVE_ADD_PAGES")
Signed-off-by: Borys Popławski <borysp@...isiblethingslab.com>
Signed-off-by: Borislav Petkov <bp@...e.de>
Reviewed-by: Jarkko Sakkinen <jarkko@...nel.org>
Cc: stable@...r.kernel.org # v5.11+
Link: https://lore.kernel.org/r/0d91ac79-6d84-abed-5821-4dbe59fa1a38@invisiblethingslab.com
---
arch/x86/kernel/cpu/sgx/ioctl.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/ioctl.c
index ebe79d6..da8b8ea 100644
--- a/arch/x86/kernel/cpu/sgx/ioctl.c
+++ b/arch/x86/kernel/cpu/sgx/ioctl.c
@@ -356,6 +356,9 @@ static int sgx_validate_offset_length(struct sgx_encl *encl,
if (!length || !IS_ALIGNED(length, PAGE_SIZE))
return -EINVAL;
+ if (offset + length < offset)
+ return -EINVAL;
+
if (offset + length - PAGE_SIZE >= encl->size)
return -EINVAL;
Powered by blists - more mailing lists