From: Linus Walleij <linus.walleij@linaro.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
llvm@lists.linux.dev
Subject: Re: [PATCH 03/14] ARM: remove duplicate memcpy() definition
Date: Tue, 28 Sep 2021 23:39:46 +0200 [thread overview]
Message-ID: <CACRpkdZYJogU_SN3H9oeVq=zJkRgRT1gDz3xp59gdqWXxw-B=w@mail.gmail.com> (raw)
In-Reply-To: <20210928154143.2106903-4-arnd@kernel.org>
On Tue, Sep 28, 2021 at 5:42 PM Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Both the decompressor code and the kasan logic try to override
> the memcpy() and memmove() definitions, which leading to a clash
> in a KASAN-enabled kernel with XZ decompression:
>
> arch/arm/boot/compressed/decompress.c:50:9: error: 'memmove' macro redefined [-Werror,-Wmacro-redefined]
> #define memmove memmove
> ^
> arch/arm/include/asm/string.h:59:9: note: previous definition is here
> #define memmove(dst, src, len) __memmove(dst, src, len)
> ^
> arch/arm/boot/compressed/decompress.c:51:9: error: 'memcpy' macro redefined [-Werror,-Wmacro-redefined]
> #define memcpy memcpy
> ^
> arch/arm/include/asm/string.h:58:9: note: previous definition is here
> #define memcpy(dst, src, len) __memcpy(dst, src, len)
> ^
>
> Here we want the set of functions from the decompressor, so undefine
> the other macros before the override.
>
> Fixes: d6d51a96c7d6 ("ARM: 9014/2: Replace string mem* functions for KASan")
> Fixes: a7f464f3db93 ("ARM: 7001/2: Wire up support for the XZ decompressor")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Solves this, right?
https://lore.kernel.org/lkml/202105091112.F5rmd4By-lkp@intel.com/
Can you put in a reported-by and Link: to this so we got it tracked?
> #ifdef CONFIG_KERNEL_XZ
> +#undef memmove
> #define memmove memmove
> +#undef memcpy
> #define memcpy memcpy
> #include "../../../../lib/decompress_unxz.c"
> #endif
That's clever, maybe drop a small comment in the code why we do this
pretty unintuitive looking thing and how this works?
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
WARNING: multiple messages have this Message-ID (diff)
From: Linus Walleij <linus.walleij@linaro.org>
To: Arnd Bergmann <arnd@kernel.org>
Cc: Russell King <linux@armlinux.org.uk>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
linux-kernel <linux-kernel@vger.kernel.org>,
Arnd Bergmann <arnd@arndb.de>, Ard Biesheuvel <ardb@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
llvm@lists.linux.dev
Subject: Re: [PATCH 03/14] ARM: remove duplicate memcpy() definition
Date: Tue, 28 Sep 2021 23:39:46 +0200 [thread overview]
Message-ID: <CACRpkdZYJogU_SN3H9oeVq=zJkRgRT1gDz3xp59gdqWXxw-B=w@mail.gmail.com> (raw)
In-Reply-To: <20210928154143.2106903-4-arnd@kernel.org>
On Tue, Sep 28, 2021 at 5:42 PM Arnd Bergmann <arnd@kernel.org> wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> Both the decompressor code and the kasan logic try to override
> the memcpy() and memmove() definitions, which leading to a clash
> in a KASAN-enabled kernel with XZ decompression:
>
> arch/arm/boot/compressed/decompress.c:50:9: error: 'memmove' macro redefined [-Werror,-Wmacro-redefined]
> #define memmove memmove
> ^
> arch/arm/include/asm/string.h:59:9: note: previous definition is here
> #define memmove(dst, src, len) __memmove(dst, src, len)
> ^
> arch/arm/boot/compressed/decompress.c:51:9: error: 'memcpy' macro redefined [-Werror,-Wmacro-redefined]
> #define memcpy memcpy
> ^
> arch/arm/include/asm/string.h:58:9: note: previous definition is here
> #define memcpy(dst, src, len) __memcpy(dst, src, len)
> ^
>
> Here we want the set of functions from the decompressor, so undefine
> the other macros before the override.
>
> Fixes: d6d51a96c7d6 ("ARM: 9014/2: Replace string mem* functions for KASan")
> Fixes: a7f464f3db93 ("ARM: 7001/2: Wire up support for the XZ decompressor")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Solves this, right?
https://lore.kernel.org/lkml/202105091112.F5rmd4By-lkp@intel.com/
Can you put in a reported-by and Link: to this so we got it tracked?
> #ifdef CONFIG_KERNEL_XZ
> +#undef memmove
> #define memmove memmove
> +#undef memcpy
> #define memcpy memcpy
> #include "../../../../lib/decompress_unxz.c"
> #endif
That's clever, maybe drop a small comment in the code why we do this
pretty unintuitive looking thing and how this works?
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Yours,
Linus Walleij
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-09-28 21:39 UTC|newest]
Thread overview: 67+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-28 15:41 [PATCH 00/14] ARM: randconfig build fixes Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 01/14] ARM: RiscPC needs older gcc version Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 16:03 ` Arnd Bergmann
2021-09-28 16:03 ` Arnd Bergmann
2021-09-28 16:03 ` Arnd Bergmann
2021-09-29 8:45 ` Arnd Bergmann
2021-09-29 8:45 ` Arnd Bergmann
2021-09-29 8:45 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 02/14] ARM: patch: fix BE32 compilation Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 21:33 ` Linus Walleij
2021-09-28 21:33 ` Linus Walleij
2021-09-28 21:33 ` Linus Walleij
2021-09-28 15:41 ` [PATCH 03/14] ARM: remove duplicate memcpy() definition Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 21:39 ` Linus Walleij [this message]
2021-09-28 21:39 ` Linus Walleij
2021-09-28 21:39 ` Linus Walleij
2021-09-28 15:41 ` [PATCH 04/14] ARM: kprobes: address gcc -Wempty-body warning Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 05/14] ARM: ARMv7-M uses BE-8, not BE-32 Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 06/14] ARM: disallow CONFIG_THUMB with ARMv4 Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-29 18:52 ` Nick Desaulniers
2021-09-29 18:52 ` Nick Desaulniers
2021-09-29 18:52 ` Nick Desaulniers
2021-10-06 16:01 ` Ard Biesheuvel
2021-10-06 16:01 ` Ard Biesheuvel
2021-09-28 15:41 ` [PATCH 07/14] ARM: fix link warning with XIP + frame-pointer Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 08/14] ARM: kprobes: fix arch_init_kprobes() prototype Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 09/14] ARM: allow compile-testing without machine record Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 10/14] ARM: only warn about XIP address when not compile testing Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 11/14] ARM: kasan: work around LPAE build warning Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 15:41 ` [PATCH 12/14] ARM: add CONFIG_PHYS_OFFSET default values Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 16:02 ` Nicolas Pitre
2021-09-28 16:02 ` Nicolas Pitre
2021-09-28 16:02 ` Nicolas Pitre
2021-09-28 21:44 ` Linus Walleij
2021-09-28 21:44 ` Linus Walleij
2021-09-28 21:44 ` Linus Walleij
2021-09-28 15:41 ` [PATCH 13/14] ARM: use .arch directives instead of assembler command line flags Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 17:10 ` Nick Desaulniers
2021-09-28 17:10 ` Nick Desaulniers
2021-09-28 17:10 ` Nick Desaulniers
2021-09-28 18:32 ` Arnd Bergmann
2021-09-28 18:32 ` Arnd Bergmann
2021-09-28 18:32 ` Arnd Bergmann
2021-09-29 18:11 ` Nick Desaulniers
2021-09-29 18:11 ` Nick Desaulniers
2021-09-29 18:11 ` Nick Desaulniers
2022-01-21 22:17 ` Nathan Chancellor
2022-01-21 22:17 ` Nathan Chancellor
2021-09-28 15:41 ` [PATCH 14/14] [RFC] ARM: forbid ftrace with clang and thumb2_kernel Arnd Bergmann
2021-09-28 15:41 ` Arnd Bergmann
2021-09-28 17:20 ` Nick Desaulniers
2021-09-28 17:20 ` Nick Desaulniers
2021-09-28 17:20 ` Nick Desaulniers
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CACRpkdZYJogU_SN3H9oeVq=zJkRgRT1gDz3xp59gdqWXxw-B=w@mail.gmail.com' \
--to=linus.walleij@linaro.org \
--cc=ardb@kernel.org \
--cc=arnd@arndb.de \
--cc=arnd@kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=llvm@lists.linux.dev \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.