linux-kernel - Re: [PATCH] jump_label: Fix anonymous union initialization

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: <1eba35cd-2b1f-64e5-0fe1-9756316b37b7@akamai.com>
Date:   Thu, 2 Mar 2017 16:07:19 -0500
From:   Jason Baron <jbaron@...mai.com>
To:     Boris Ostrovsky <boris.ostrovsky@...cle.com>,
        Steven Rostedt <rostedt@...dmis.org>
Cc:     peterz@...radead.org, mingo@...nel.org,
        linux-kernel@...r.kernel.org
Subject: Re: [PATCH] jump_label: Fix anonymous union initialization

On 02/28/2017 11:32 AM, Boris Ostrovsky wrote:
> Pre-4.6 gcc do not allow direct static initialization of members of
> anonymous structs/unions. After commit 3821fd35b58d ("jump_label:
> Reduce the size of struct static_key") STATIC_KEY_INIT_{TRUE|FALSE}
> definitions cannot be compiled with those older compilers.
>
> Placing initializers inside curved brackets works around this problem.
>
> Signed-off-by: Boris Ostrovsky <boris.ostrovsky@...cle.com>
> ---
>  include/linux/jump_label.h | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/include/linux/jump_label.h b/include/linux/jump_label.h
> index 8e06d75..518020b 100644
> --- a/include/linux/jump_label.h
> +++ b/include/linux/jump_label.h
> @@ -166,10 +166,10 @@ extern void arch_jump_label_transform_static(struct jump_entry *entry,
>   */
>  #define STATIC_KEY_INIT_TRUE					\
>  	{ .enabled = { 1 },					\
> -	  .entries = (void *)JUMP_TYPE_TRUE }
> +	  { .entries = (void *)JUMP_TYPE_TRUE } }
>  #define STATIC_KEY_INIT_FALSE					\
>  	{ .enabled = { 0 },					\
> -	  .entries = (void *)JUMP_TYPE_FALSE }
> +	  { .entries = (void *)JUMP_TYPE_FALSE } }
>
>  #else  /* !HAVE_JUMP_LABEL */
>
>

(Adding Steve to 'cc)

Thanks for the fix.

Reviewed-by: Jason Baron <jbaron@...mai.com>

Thanks,

-Jason