From mboxrd@z Thu Jan 1 00:00:00 1970 From: Mimi Zohar Date: Thu, 09 May 2019 15:46:20 +0000 Subject: Re: [PATCH v10 06/12] ima: Use designated initializers for struct ima_event_data Message-Id: <1557416780.10635.66.camel@linux.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset="ibm852" Content-Transfer-Encoding: base64 List-Id: References: <20190418035120.2354-1-bauerman@linux.ibm.com> <20190418035120.2354-7-bauerman@linux.ibm.com> In-Reply-To: <20190418035120.2354-7-bauerman@linux.ibm.com> To: Thiago Jung Bauermann , linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , David Howells , David Woodhouse , Jessica Yu , Herbert Xu , "David S. Miller" , Jonathan Corbet , "AKASHI, Takahiro" T24gVGh1LCAyMDE5LTA0LTE4IGF0IDAwOjUxIC0wMzAwLCBUaGlhZ28gSnVuZyBCYXVlcm1hbm4g d3JvdGU6Cj4gRGVzaWduYXRlZCBpbml0aWFsaXplcnMgYWxsb3cgc3BlY2lmeWluZyBvbmx5IHRo ZSBtZW1iZXJzIG9mIHRoZSBzdHJ1Y3QKPiB0aGF0IG5lZWQgaW5pdGlhbGl6YXRpb24uIE5vbi1t ZW50aW9uZWQgbWVtYmVycyBhcmUgaW5pdGlhbGl6ZWQgdG8gemVyby4KPiAKPiBUaGlzIG1ha2Vz IHRoZSBjb2RlIGEgYml0IGNsZWFyZXIgKHBhcnRpY3VsYXJseSBpbiBpbWFfYWRkX2Jvb3RfYWdn cmVnYXRlKCkKPiBhbmQgYWxzbyBhbGxvd3MgYWRkaW5nIGEgbmV3IG1lbWJlciB0byB0aGUgc3Ry dWN0IHdpdGhvdXQgaGF2aW5nIHRvIHVwZGF0ZQo+IGFsbCBzdHJ1Y3QgaW5pdGlhbGl6YXRpb25z Lgo+IAo+IFNpZ25lZC1vZmYtYnk6IFRoaWFnbyBKdW5nIEJhdWVybWFubiA8YmF1ZXJtYW5AbGlu dXguaWJtLmNvbT4KClJldmlld2VkLWJ5OiDCoE1pbWkgWm9oYXIgPHpvaGFyQGxpbnV4LmlibS5j b20+Cgo+IC0tLQo+ICBzZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9hcGkuYyAgfCAxMSArKysr KysrLS0tLQo+ICBzZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9pbml0LmMgfCAgNCArKy0tCj4g IDIgZmlsZXMgY2hhbmdlZCwgOSBpbnNlcnRpb25zKCspLCA2IGRlbGV0aW9ucygtKQo+IAo+IGRp ZmYgLS1naXQgYS9zZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9hcGkuYyBiL3NlY3VyaXR5L2lu dGVncml0eS9pbWEvaW1hX2FwaS5jCj4gaW5kZXggYzc1MDVmYjEyMmQ0Li4wNjM5ZDA2MzFmMmMg MTAwNjQ0Cj4gLS0tIGEvc2VjdXJpdHkvaW50ZWdyaXR5L2ltYS9pbWFfYXBpLmMKPiArKysgYi9z ZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9hcGkuYwo+IEBAIC0xMzMsOCArMTMzLDkgQEAgdm9p ZCBpbWFfYWRkX3Zpb2xhdGlvbihzdHJ1Y3QgZmlsZSAqZmlsZSwgY29uc3QgdW5zaWduZWQgY2hh ciAqZmlsZW5hbWUsCj4gIHsKPiAgCXN0cnVjdCBpbWFfdGVtcGxhdGVfZW50cnkgKmVudHJ5Owo+ ICAJc3RydWN0IGlub2RlICppbm9kZSA9IGZpbGVfaW5vZGUoZmlsZSk7Cj4gLQlzdHJ1Y3QgaW1h X2V2ZW50X2RhdGEgZXZlbnRfZGF0YSA9IHtpaW50LCBmaWxlLCBmaWxlbmFtZSwgTlVMTCwgMCwK PiAtCQkJCQkgICAgY2F1c2V9Owo+ICsJc3RydWN0IGltYV9ldmVudF9kYXRhIGV2ZW50X2RhdGEg PSB7IC5paW50ID0gaWludCwgLmZpbGUgPSBmaWxlLAo+ICsJCQkJCSAgICAgLmZpbGVuYW1lID0g ZmlsZW5hbWUsCj4gKwkJCQkJICAgICAudmlvbGF0aW9uID0gY2F1c2UgfTsKPiAgCWludCB2aW9s YXRpb24gPSAxOwo+ICAJaW50IHJlc3VsdDsKPiAgCj4gQEAgLTI4NCw4ICsyODUsMTAgQEAgdm9p ZCBpbWFfc3RvcmVfbWVhc3VyZW1lbnQoc3RydWN0IGludGVncml0eV9paW50X2NhY2hlICppaW50 LAo+ICAJaW50IHJlc3VsdCA9IC1FTk9NRU07Cj4gIAlzdHJ1Y3QgaW5vZGUgKmlub2RlID0gZmls ZV9pbm9kZShmaWxlKTsKPiAgCXN0cnVjdCBpbWFfdGVtcGxhdGVfZW50cnkgKmVudHJ5Owo+IC0J c3RydWN0IGltYV9ldmVudF9kYXRhIGV2ZW50X2RhdGEgPSB7aWludCwgZmlsZSwgZmlsZW5hbWUs IHhhdHRyX3ZhbHVlLAo+IC0JCQkJCSAgICB4YXR0cl9sZW4sIE5VTEx9Owo+ICsJc3RydWN0IGlt YV9ldmVudF9kYXRhIGV2ZW50X2RhdGEgPSB7IC5paW50ID0gaWludCwgLmZpbGUgPSBmaWxlLAo+ ICsJCQkJCSAgICAgLmZpbGVuYW1lID0gZmlsZW5hbWUsCj4gKwkJCQkJICAgICAueGF0dHJfdmFs dWUgPSB4YXR0cl92YWx1ZSwKPiArCQkJCQkgICAgIC54YXR0cl9sZW4gPSB4YXR0cl9sZW4gfTsK PiAgCWludCB2aW9sYXRpb24gPSAwOwo+ICAKPiAgCWlmIChpaW50LT5tZWFzdXJlZF9wY3JzICYg KDB4MSA8PCBwY3IpKQo+IGRpZmYgLS1naXQgYS9zZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9p bml0LmMgYi9zZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9pbml0LmMKPiBpbmRleCA2YzkyOTU0 NDk3NTEuLmVmNmMzYTI2Mjk2ZSAxMDA2NDQKPiAtLS0gYS9zZWN1cml0eS9pbnRlZ3JpdHkvaW1h L2ltYV9pbml0LmMKPiArKysgYi9zZWN1cml0eS9pbnRlZ3JpdHkvaW1hL2ltYV9pbml0LmMKPiBA QCAtNDksOCArNDksOCBAQCBzdGF0aWMgaW50IF9faW5pdCBpbWFfYWRkX2Jvb3RfYWdncmVnYXRl KHZvaWQpCj4gIAljb25zdCBjaGFyICphdWRpdF9jYXVzZSA9ICJFTk9NRU0iOwo+ICAJc3RydWN0 IGltYV90ZW1wbGF0ZV9lbnRyeSAqZW50cnk7Cj4gIAlzdHJ1Y3QgaW50ZWdyaXR5X2lpbnRfY2Fj aGUgdG1wX2lpbnQsICppaW50ID0gJnRtcF9paW50Owo+IC0Jc3RydWN0IGltYV9ldmVudF9kYXRh IGV2ZW50X2RhdGEgPSB7aWludCwgTlVMTCwgYm9vdF9hZ2dyZWdhdGVfbmFtZSwKPiAtCQkJCQkg ICAgTlVMTCwgMCwgTlVMTH07Cj4gKwlzdHJ1Y3QgaW1hX2V2ZW50X2RhdGEgZXZlbnRfZGF0YSA9 IHsgLmlpbnQgPSBpaW50LAo+ICsJCQkJCSAgICAgLmZpbGVuYW1lID0gYm9vdF9hZ2dyZWdhdGVf bmFtZSB9Owo+ICAJaW50IHJlc3VsdCA9IC1FTk9NRU07Cj4gIAlpbnQgdmlvbGF0aW9uID0gMDsK PiAgCXN0cnVjdCB7Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AFBABC04AB1 for ; Thu, 9 May 2019 15:46:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7EF462173C for ; Thu, 9 May 2019 15:46:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726469AbfEIPqo (ORCPT ); Thu, 9 May 2019 11:46:44 -0400 Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]:46498 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726558AbfEIPqo (ORCPT ); Thu, 9 May 2019 11:46:44 -0400 Received: from pps.filterd (m0098393.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x49FcThl016683 for ; Thu, 9 May 2019 11:46:43 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2scmr7fbkf-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 09 May 2019 11:46:43 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 May 2019 16:46:40 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 9 May 2019 16:46:34 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x49FkX0Q36700272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 May 2019 15:46:33 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 859404C04A; Thu, 9 May 2019 15:46:33 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6A6A54C04E; Thu, 9 May 2019 15:46:31 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.95.107]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 9 May 2019 15:46:31 +0000 (GMT) Subject: Re: [PATCH v10 06/12] ima: Use designated initializers for struct ima_event_data From: Mimi Zohar To: Thiago Jung Bauermann , linux-integrity@vger.kernel.org Cc: linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, Dmitry Kasatkin , James Morris , "Serge E. Hallyn" , David Howells , David Woodhouse , Jessica Yu , Herbert Xu , "David S. Miller" , Jonathan Corbet , "AKASHI, Takahiro" Date: Thu, 09 May 2019 11:46:20 -0400 In-Reply-To: <20190418035120.2354-7-bauerman@linux.ibm.com> References: <20190418035120.2354-1-bauerman@linux.ibm.com> <20190418035120.2354-7-bauerman@linux.ibm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19050915-0020-0000-0000-0000033AFAC4 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050915-0021-0000-0000-0000218DA29E Message-Id: <1557416780.10635.66.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,, definitions=2019-05-09_02:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905090090 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org 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 Reviewed-by:  Mimi Zohar > --- > 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 { From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CF25C04AB1 for ; Thu, 9 May 2019 15:48:32 +0000 (UTC) Received: from lists.ozlabs.org (lists.ozlabs.org [203.11.71.2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE3AE2175B for ; Thu, 9 May 2019 15:48:31 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE3AE2175B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.ibm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 450HnB13F6zDqRt for ; Fri, 10 May 2019 01:48:30 +1000 (AEST) Authentication-Results: lists.ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=linux.ibm.com (client-ip=148.163.158.5; helo=mx0a-001b2d01.pphosted.com; envelope-from=zohar@linux.ibm.com; receiver=) Authentication-Results: lists.ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 450HlB5GmSzDqRR for ; Fri, 10 May 2019 01:46:46 +1000 (AEST) Received: from pps.filterd (m0098417.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.27/8.16.0.27) with SMTP id x49FcTv7086107 for ; Thu, 9 May 2019 11:46:44 -0400 Received: from e06smtp05.uk.ibm.com (e06smtp05.uk.ibm.com [195.75.94.101]) by mx0a-001b2d01.pphosted.com with ESMTP id 2scnjyd8j3-1 (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 09 May 2019 11:46:42 -0400 Received: from localhost by e06smtp05.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 9 May 2019 16:46:40 +0100 Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197) by e06smtp05.uk.ibm.com (192.168.101.135) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256) Thu, 9 May 2019 16:46:34 +0100 Received: from d06av22.portsmouth.uk.ibm.com (d06av22.portsmouth.uk.ibm.com [9.149.105.58]) by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id x49FkX0Q36700272 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 9 May 2019 15:46:33 GMT Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 859404C04A; Thu, 9 May 2019 15:46:33 +0000 (GMT) Received: from d06av22.portsmouth.uk.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6A6A54C04E; Thu, 9 May 2019 15:46:31 +0000 (GMT) Received: from localhost.localdomain (unknown [9.80.95.107]) by d06av22.portsmouth.uk.ibm.com (Postfix) with ESMTP; Thu, 9 May 2019 15:46:31 +0000 (GMT) Subject: Re: [PATCH v10 06/12] ima: Use designated initializers for struct ima_event_data From: Mimi Zohar To: Thiago Jung Bauermann , linux-integrity@vger.kernel.org Date: Thu, 09 May 2019 11:46:20 -0400 In-Reply-To: <20190418035120.2354-7-bauerman@linux.ibm.com> References: <20190418035120.2354-1-bauerman@linux.ibm.com> <20190418035120.2354-7-bauerman@linux.ibm.com> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.20.5 (3.20.5-1.fc24) Mime-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 x-cbid: 19050915-0020-0000-0000-0000033AFAC4 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19050915-0021-0000-0000-0000218DA29E Message-Id: <1557416780.10635.66.camel@linux.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2019-05-09_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1905090090 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Herbert Xu , linux-doc@vger.kernel.org, Dmitry Kasatkin , "David S. Miller" , Jonathan Corbet , linux-kernel@vger.kernel.org, James Morris , David Howells , "AKASHI, Takahiro" , linux-security-module@vger.kernel.org, keyrings@vger.kernel.org, linux-crypto@vger.kernel.org, Jessica Yu , linuxppc-dev@lists.ozlabs.org, David Woodhouse , "Serge E. Hallyn" Errors-To: linuxppc-dev-bounces+linuxppc-dev=archiver.kernel.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 Reviewed-by:  Mimi Zohar > --- > 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 {