linux-kernel - Re: [PATCH v10 06/12] ima: Use designated initializers for struct ima_event

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: <1557416780.10635.66.camel@linux.ibm.com>
Date:   Thu, 09 May 2019 11:46:20 -0400
From:   Mimi Zohar <zohar@...ux.ibm.com>
To:     Thiago Jung Bauermann <bauerman@...ux.ibm.com>,
        linux-integrity@...r.kernel.org
Cc:     linux-security-module@...r.kernel.org, keyrings@...r.kernel.org,
        linux-crypto@...r.kernel.org, linuxppc-dev@...ts.ozlabs.org,
        linux-doc@...r.kernel.org, linux-kernel@...r.kernel.org,
        Dmitry Kasatkin <dmitry.kasatkin@...il.com>,
        James Morris <jmorris@...ei.org>,
        "Serge E. Hallyn" <serge@...lyn.com>,
        David Howells <dhowells@...hat.com>,
        David Woodhouse <dwmw2@...radead.org>,
        Jessica Yu <jeyu@...nel.org>,
        Herbert Xu <herbert@...dor.apana.org.au>,
        "David S. Miller" <davem@...emloft.net>,
        Jonathan Corbet <corbet@....net>,
        "AKASHI, Takahiro" <takahiro.akashi@...aro.org>
Subject: Re: [PATCH v10 06/12] ima: Use designated initializers for struct
 ima_event_data

On Thu, 2019-04-18 at 00:51 -0300, Thiago Jung Bauermann wrote:
> Designated initializers allow specifying only the members of the struct
> that need initialization. Non-mentioned members are initialized to zero.
> 
> This makes the code a bit clearer (particularly in ima_add_boot_aggregate()
> and also allows adding a new member to the struct without having to update
> all struct initializations.
> 
> Signed-off-by: Thiago Jung Bauermann <bauerman@...ux.ibm.com>

Reviewed-by:  Mimi Zohar <zohar@...ux.ibm.com>

> ---
>  security/integrity/ima/ima_api.c  | 11 +++++++----
>  security/integrity/ima/ima_init.c |  4 ++--
>  2 files changed, 9 insertions(+), 6 deletions(-)
> 
> diff --git a/security/integrity/ima/ima_api.c b/security/integrity/ima/ima_api.c
> index c7505fb122d4..0639d0631f2c 100644
> --- a/security/integrity/ima/ima_api.c
> +++ b/security/integrity/ima/ima_api.c
> @@ -133,8 +133,9 @@ void ima_add_violation(struct file *file, const unsigned char *filename,
>  {
>  	struct ima_template_entry *entry;
>  	struct inode *inode = file_inode(file);
> -	struct ima_event_data event_data = {iint, file, filename, NULL, 0,
> -					    cause};
> +	struct ima_event_data event_data = { .iint = iint, .file = file,
> +					     .filename = filename,
> +					     .violation = cause };
>  	int violation = 1;
>  	int result;
>  
> @@ -284,8 +285,10 @@ void ima_store_measurement(struct integrity_iint_cache *iint,
>  	int result = -ENOMEM;
>  	struct inode *inode = file_inode(file);
>  	struct ima_template_entry *entry;
> -	struct ima_event_data event_data = {iint, file, filename, xattr_value,
> -					    xattr_len, NULL};
> +	struct ima_event_data event_data = { .iint = iint, .file = file,
> +					     .filename = filename,
> +					     .xattr_value = xattr_value,
> +					     .xattr_len = xattr_len };
>  	int violation = 0;
>  
>  	if (iint->measured_pcrs & (0x1 << pcr))
> diff --git a/security/integrity/ima/ima_init.c b/security/integrity/ima/ima_init.c
> index 6c9295449751..ef6c3a26296e 100644
> --- a/security/integrity/ima/ima_init.c
> +++ b/security/integrity/ima/ima_init.c
> @@ -49,8 +49,8 @@ static int __init ima_add_boot_aggregate(void)
>  	const char *audit_cause = "ENOMEM";
>  	struct ima_template_entry *entry;
>  	struct integrity_iint_cache tmp_iint, *iint = &tmp_iint;
> -	struct ima_event_data event_data = {iint, NULL, boot_aggregate_name,
> -					    NULL, 0, NULL};
> +	struct ima_event_data event_data = { .iint = iint,
> +					     .filename = boot_aggregate_name };
>  	int result = -ENOMEM;
>  	int violation = 0;
>  	struct {