linux-kernel - Re: [PATCH v3] x86/boot: Warn on future overlapping memcpy() use

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAGXu5jJfWaCvTLChd6SsXzHDX3ev13GYGA7eN_WmJBXJQ4vODg@mail.gmail.com>
Date:	Thu, 28 Apr 2016 16:49:44 -0700
From:	Kees Cook <keescook@...omium.org>
To:	Ingo Molnar <mingo@...nel.org>,
	Lasse Collin <lasse.collin@...aani.org>
Cc:	"H. Peter Anvin" <hpa@...or.com>,
	Thomas Gleixner <tglx@...utronix.de>,
	Ingo Molnar <mingo@...hat.com>,
	"x86@...nel.org" <x86@...nel.org>,
	LKML <linux-kernel@...r.kernel.org>,
	One Thousand Gnomes <gnomes@...rguk.ukuu.org.uk>,
	Yinghai Lu <yinghai@...nel.org>, Baoquan He <bhe@...hat.com>,
	Borislav Petkov <bp@...e.de>
Subject: Re: [PATCH v3] x86/boot: Warn on future overlapping memcpy() use

(Sorry, this v3 got sent to an incomplete CC list...)


On Thu, Apr 28, 2016 at 4:46 PM, Kees Cook <keescook@...omium.org> wrote:
> If an overlapping memcpy() is ever attempted, we should report it and
> gracefully call memmove(). These cases can be found and fixed to use
> memmove() correctly, but in the meantime, we will not break booting.
>
> Suggested-by: Ingo Molnar <mingo@...nel.org>
> Signed-off-by: Kees Cook <keescook@...omium.org>
> ---
>  arch/x86/boot/compressed/string.c | 15 +++++++++++++--
>  1 file changed, 13 insertions(+), 2 deletions(-)
>
> diff --git a/arch/x86/boot/compressed/string.c b/arch/x86/boot/compressed/string.c
> index 2befeca1aada..7402227fdfdb 100644
> --- a/arch/x86/boot/compressed/string.c
> +++ b/arch/x86/boot/compressed/string.c
> @@ -8,7 +8,7 @@
>  #include "../string.c"
>
>  #ifdef CONFIG_X86_32
> -void *memcpy(void *dest, const void *src, size_t n)
> +static void *__memcpy(void *dest, const void *src, size_t n)
>  {
>         int d0, d1, d2;
>         asm volatile(
> @@ -22,7 +22,7 @@ void *memcpy(void *dest, const void *src, size_t n)
>         return dest;
>  }
>  #else
> -void *memcpy(void *dest, const void *src, size_t n)
> +static void *__memcpy(void *dest, const void *src, size_t n)
>  {
>         long d0, d1, d2;
>         asm volatile(
> @@ -60,3 +60,14 @@ void *memmove(void *dest, const void *src, size_t n)
>
>         return dest;
>  }
> +
> +/* Detect and warn about potential overlaps, but handle them with memmove. */
> +void *memcpy(void *dest, const void *src, size_t n)
> +{
> +       if (dest > src && dest - src < n) {
> +               warn("Avoiding potentially unsafe overlapping memcpy()!");
> +               return memmove(dest, src, n);
> +       }
> +       return __memcpy(dest, src, n);
> +}
> +
> --
> 2.6.3
>
>
> --
> Kees Cook
> Chrome OS & Brillo Security



-- 
Kees Cook
Chrome OS & Brillo Security