Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <0eb638e3-b9ac-6dec-6881-b885c7874b45@suse.cz>
Date:   Thu, 29 Sep 2022 11:14:47 +0200
MIME-Version: 1.0
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.3.0
Subject: Re: [PATCH] compiler_types.h: Test for __alloc_size__ again
To:     Kees Cook <keescook@chromium.org>
Cc:     Miguel Ojeda <ojeda@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>,
        Andrew Morton <akpm@linux-foundation.org>,
        Yonghong Song <yhs@fb.com>, Hao Luo <haoluo@google.com>,
        Marco Elver <elver@google.com>,
        Geert Uytterhoeven <geert@linux-m68k.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Kumar Kartikeya Dwivedi <memxor@gmail.com>,
        Rasmus Villemoes <linux@rasmusvillemoes.dk>,
        linux-kernel@vger.kernel.org, linux-hardening@vger.kernel.org
References: <20220929081642.1932200-1-keescook@chromium.org>
Content-Language: en-US
From:   Vlastimil Babka <vbabka@suse.cz>
In-Reply-To: <20220929081642.1932200-1-keescook@chromium.org>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Precedence: bulk

On 9/29/22 10:16, Kees Cook wrote:
> While the "alloc_size" attribute is available on all GCC versions, I
> forgot that it gets disabled explicitly by the kernel in GCC < 9.1 due
> to misbehaviors. Add a note to the compiler_attributes.h entry for it,
> and restore the #ifdef in compiler_types.h.
> 
> Cc: Vlastimil Babka <vbabka@suse.cz>
> Cc: Miguel Ojeda <ojeda@kernel.org>
> Cc: Nick Desaulniers <ndesaulniers@google.com>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Yonghong Song <yhs@fb.com>
> Cc: Hao Luo <haoluo@google.com>
> Cc: Marco Elver <elver@google.com>
> Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
> Link: https://lore.kernel.org/lkml/CAMuHMdXK+UN1YVZm9DenuXAM8hZRUZJwp=SXsueP7sWiVU3a9A@mail.gmail.com
> Fixes: 63caa04ec60583b1 ("slab: Remove __malloc attribute from realloc functions")
> Signed-off-by: Kees Cook <keescook@chromium.org>

Thanks, I decided to late squash it so we don't needlessly cause issues for
people doing bisections with gcc-8 later.

> ---
> I swear I sent this earlier today, but I don't see it on lore still. Resending,
> so apologies if this is a duplicate.
> ---
>  include/linux/compiler_attributes.h | 3 ++-
>  include/linux/compiler_types.h      | 9 +++++++--
>  2 files changed, 9 insertions(+), 3 deletions(-)
> 
> diff --git a/include/linux/compiler_attributes.h b/include/linux/compiler_attributes.h
> index 465be5f072ff..55fbb6091ecf 100644
> --- a/include/linux/compiler_attributes.h
> +++ b/include/linux/compiler_attributes.h
> @@ -65,7 +65,8 @@
>  
>  /*
>   * Note: do not use this directly. Instead, use __alloc_size() since it is conditionally
> - * available and includes other attributes.
> + * available and includes other attributes. For GCC < 9.1, __alloc_size__ gets undefined
> + * in compiler-gcc.h, due to misbehaviors.
>   *
>   *   gcc: https://gcc.gnu.org/onlinedocs/gcc/Common-Function-Attributes.html#index-alloc_005fsize-function-attribute
>   * clang: https://clang.llvm.org/docs/AttributeReference.html#alloc-size
> diff --git a/include/linux/compiler_types.h b/include/linux/compiler_types.h
> index f141a6f6b9f6..0717534f8364 100644
> --- a/include/linux/compiler_types.h
> +++ b/include/linux/compiler_types.h
> @@ -275,8 +275,13 @@ struct ftrace_likely_data {
>   * be performing a _reallocation_, as that may alias the existing pointer.
>   * For these, use __realloc_size().
>   */
> -#define __alloc_size(x, ...)	__alloc_size__(x, ## __VA_ARGS__) __malloc
> -#define __realloc_size(x, ...)	__alloc_size__(x, ## __VA_ARGS__)
> +#ifdef __alloc_size__
> +# define __alloc_size(x, ...)	__alloc_size__(x, ## __VA_ARGS__) __malloc
> +# define __realloc_size(x, ...)	__alloc_size__(x, ## __VA_ARGS__)
> +#else
> +# define __alloc_size(x, ...)	__malloc
> +# define __realloc_size(x, ...)
> +#endif
>  
>  #ifndef asm_volatile_goto
>  #define asm_volatile_goto(x...) asm goto(x)