Received-SPF: pass (google.com: domain of linux-kernel+bounces-35399-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1;
Precedence: bulk
MIME-Version: 1.0
References: <20240123011238.work.301-kees@kernel.org>
In-Reply-To: <20240123011238.work.301-kees@kernel.org>
From: Ard Biesheuvel <ardb@kernel.org>
Date: Tue, 23 Jan 2024 14:44:37 +0100
Message-ID: <CAMj1kXGDqPEBO1jm3FqN2dLPPTDL+xdW9mNCUV16bfJ+AtmS-Q@mail.gmail.com>
Subject: Re: [PATCH] ARM: fault: Implement copy_from_kernel_nofault_allowed()
To: Kees Cook <keescook@chromium.org>
Cc: Russell King <linux@armlinux.org.uk>, Mark Brown <broonie@kernel.org>, 
	Wang Kefeng <wangkefeng.wang@huawei.com>, Andrew Morton <akpm@linux-foundation.org>, 
	Ben Hutchings <ben@decadent.org.uk>, linux-arm-kernel@lists.infradead.org, 
	"Russell King (Oracle)" <rmk+kernel@armlinux.org.uk>, Hugh Dickins <hughd@google.com>, 
	linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"

On Tue, 23 Jan 2024 at 02:12, Kees Cook <keescook@chromium.org> wrote:
>
> Under PAN emulation when dumping backtraces from things like the
> LKDTM EXEC_USERSPACE test[1], a double fault (which would hang a CPU)
> would happen because of dump_instr() attempting to read a userspace
> address. Make sure copy_from_kernel_nofault() does not attempt this
> any more.
>
> Reported-by: Mark Brown <broonie@kernel.org>
> Link: https://lore.kernel.org/all/202401181125.D48DCB4C@keescook/ [1]
> Suggested-by: "Russell King (Oracle)" <linux@armlinux.org.uk>
> Cc: Russell King <linux@armlinux.org.uk>
> Cc: Ard Biesheuvel <ardb@kernel.org>
> Cc: Wang Kefeng <wangkefeng.wang@huawei.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Ben Hutchings <ben@decadent.org.uk>
> Cc: linux-arm-kernel@lists.infradead.org
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: Ard Biesheuvel <ardb@kernel.org>

> ---
>  arch/arm/mm/fault.c | 7 +++++++
>  1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm/mm/fault.c b/arch/arm/mm/fault.c
> index e804432e905e..bc5b959b6f90 100644
> --- a/arch/arm/mm/fault.c
> +++ b/arch/arm/mm/fault.c
> @@ -25,6 +25,13 @@
>
>  #include "fault.h"
>
> +bool copy_from_kernel_nofault_allowed(const void *unsafe_src, size_t size)
> +{
> +       unsigned long addr = (unsigned long)unsafe_src;
> +
> +       return addr >= TASK_SIZE && ULONG_MAX - addr >= size;
> +}
> +
>  #ifdef CONFIG_MMU
>
>  /*
> --
> 2.34.1
>