Received-SPF: pass (google.com: domain of linux-kernel+bounces-34972-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Precedence: bulk
Mime-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
Date: Tue, 23 Jan 2024 09:15:16 +0000
Message-Id: <CYLYZT8Q5YPS.BF3JHG87K4EJ@seitikki>
Cc: "Dave Hansen" <dave.hansen@linux.intel.com>, "Thomas Gleixner"
 <tglx@linutronix.de>, "Ingo Molnar" <mingo@redhat.com>, "Borislav Petkov"
 <bp@alien8.de>, <x86@kernel.org>, "H. Peter Anvin" <hpa@zytor.com>,
 <linux-sgx@vger.kernel.org>, "Gustavo A. R. Silva" <gustavoars@kernel.org>,
 "Bill Wendling" <morbo@google.com>, "Justin Stitt"
 <justinstitt@google.com>, <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH 22/82] x86/sgx: Refactor intentional wrap-around
 calculation
From: "Jarkko Sakkinen" <jarkko@kernel.org>
To: "Kees Cook" <keescook@chromium.org>, <linux-hardening@vger.kernel.org>
References: <20240122235208.work.748-kees@kernel.org>
 <20240123002814.1396804-22-keescook@chromium.org>
In-Reply-To: <20240123002814.1396804-22-keescook@chromium.org>

On Tue Jan 23, 2024 at 12:26 AM UTC, Kees Cook wrote:
> In an effort to separate intentional arithmetic wrap-around from
> unexpected wrap-around, we need to refactor places that depend on this
> kind of math. One of the most common code patterns of this is:
>
> 	VAR + value < VAR
>
> Notably, this is considered "undefined behavior" for signed and pointer
> types, which the kernel works around by using the -fno-strict-overflow
> option in the build[1] (which used to just be -fwrapv). Regardless, we
> want to get the kernel source to the position where we can meaningfully
> instrument arithmetic wrap-around conditions and catch them when they
> are unexpected, regardless of whether they are signed[2], unsigned[3],
> or pointer[4] types.
>
> Refactor open-coded unsigned wrap-around addition test to use
> check_add_overflow(), retaining the result for later usage (which removes
> the redundant open-coded addition). This paves the way to enabling the
> wrap-around sanitizers in the future.
>
> Link: https://git.kernel.org/linus/68df3755e383e6fecf2354a67b08f92f185365=
94 [1]
> Link: https://github.com/KSPP/linux/issues/26 [2]
> Link: https://github.com/KSPP/linux/issues/27 [3]
> Link: https://github.com/KSPP/linux/issues/344 [4]
> Cc: Jarkko Sakkinen <jarkko@kernel.org>
> Cc: Dave Hansen <dave.hansen@linux.intel.com>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: x86@kernel.org
> Cc: "H. Peter Anvin" <hpa@zytor.com>
> Cc: linux-sgx@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>
> ---
>  arch/x86/kernel/cpu/sgx/ioctl.c | 6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/kernel/cpu/sgx/ioctl.c b/arch/x86/kernel/cpu/sgx/io=
ctl.c
> index b65ab214bdf5..4b8f6c9f8ef5 100644
> --- a/arch/x86/kernel/cpu/sgx/ioctl.c
> +++ b/arch/x86/kernel/cpu/sgx/ioctl.c
> @@ -350,16 +350,18 @@ static int sgx_validate_offset_length(struct sgx_en=
cl *encl,
>  				      unsigned long offset,
>  				      unsigned long length)
>  {
> +	unsigned long sum;
> +
>  	if (!IS_ALIGNED(offset, PAGE_SIZE))
>  		return -EINVAL;
> =20
>  	if (!length || !IS_ALIGNED(length, PAGE_SIZE))
>  		return -EINVAL;
> =20
> -	if (offset + length < offset)
> +	if (check_add_overflow(offset, length, &sum))
>  		return -EINVAL;
> =20
> -	if (offset + length - PAGE_SIZE >=3D encl->size)
> +	if (sum - PAGE_SIZE >=3D encl->size)
>  		return -EINVAL;
> =20
>  	return 0;

Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>

BR, Jarkko