x86/sgx: Add overflow check in sgx_validate_offset_length()
authorBorys Popławski <borysp@invisiblethingslab.com>
Tue, 4 Oct 2022 22:59:03 +0000 (00:59 +0200)
committerBorislav Petkov <bp@suse.de>
Tue, 8 Nov 2022 19:34:05 +0000 (20:34 +0100)
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@invisiblethingslab.com>
Signed-off-by: Borislav Petkov <bp@suse.de>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Cc: stable@vger.kernel.org # v5.11+
Link: https://lore.kernel.org/r/0d91ac79-6d84-abed-5821-4dbe59fa1a38@invisiblethingslab.com
arch/x86/kernel/cpu/sgx/ioctl.c

index ebe79d6..da8b8ea 100644 (file)
@@ -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;