Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751352AbcJJSxo (ORCPT ); Mon, 10 Oct 2016 14:53:44 -0400 Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:54639 "EHLO mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750976AbcJJSxn (ORCPT ); Mon, 10 Oct 2016 14:53:43 -0400 Subject: Re: [PATCH RESEND 2/3] tpm: replace dynamically allocated bios_dir with a static array To: Jarkko Sakkinen , Peter Huewe References: <1475349926-476-1-git-send-email-jarkko.sakkinen@linux.intel.com> <1475349926-476-3-git-send-email-jarkko.sakkinen@linux.intel.com> Cc: Marcel Selhorst , Jason Gunthorpe , "moderated list:TPM DEVICE DRIVER" , open list From: Nayna Date: Tue, 11 Oct 2016 00:23:15 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.6.0 MIME-Version: 1.0 In-Reply-To: <1475349926-476-3-git-send-email-jarkko.sakkinen@linux.intel.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit X-TM-AS-GCONF: 00 X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16101018-8235-0000-0000-0000095DA27F X-IBM-SpamModules-Scores: X-IBM-SpamModules-Versions: BY=3.00005887; HX=3.00000240; KW=3.00000007; PH=3.00000004; SC=3.00000186; SDB=6.00766560; UDB=6.00366659; IPR=6.00542690; BA=6.00004799; NDR=6.00000001; ZLA=6.00000005; ZF=6.00000009; ZB=6.00000000; ZP=6.00000000; ZH=6.00000000; ZU=6.00000002; MB=3.00012939; XFM=3.00000011; UTC=2016-10-10 18:53:40 X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16101018-8236-0000-0000-000035870195 Message-Id: <57FBE39B.2030301@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2016-10-10_08:,, signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=0 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1609300000 definitions=main-1610100313 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 5727 Lines: 194 On 10/02/2016 12:55 AM, Jarkko Sakkinen wrote: > This commit is based on a commit by Nayna Jain. Replaced dynamically > allocated bios_dir with a static array as the size is always constant. > > Suggested-by: Jason Gunthorpe > Signed-off-by: Nayna Jain > Signed-off-by: Jarkko Sakkinen > --- > drivers/char/tpm/tpm-chip.c | 9 +++--- > drivers/char/tpm/tpm.h | 3 +- > drivers/char/tpm/tpm_eventlog.c | 62 +++++++++++++++++++---------------------- > drivers/char/tpm/tpm_eventlog.h | 10 +++---- > 4 files changed, 41 insertions(+), 43 deletions(-) > > diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c > index e595013..a56b609 100644 > --- a/drivers/char/tpm/tpm-chip.c > +++ b/drivers/char/tpm/tpm-chip.c > @@ -278,14 +278,16 @@ static void tpm_del_char_device(struct tpm_chip *chip) > > static int tpm1_chip_register(struct tpm_chip *chip) > { > + int rc; > + > if (chip->flags & TPM_CHIP_FLAG_TPM2) > return 0; > > tpm_sysfs_add_device(chip); > > - chip->bios_dir = tpm_bios_log_setup(dev_name(&chip->dev)); > + rc = tpm_bios_log_setup(chip); > > - return 0; > + return rc; > } > > static void tpm1_chip_unregister(struct tpm_chip *chip) > @@ -293,8 +295,7 @@ static void tpm1_chip_unregister(struct tpm_chip *chip) > if (chip->flags & TPM_CHIP_FLAG_TPM2) > return; > > - if (chip->bios_dir) > - tpm_bios_log_teardown(chip->bios_dir); > + tpm_bios_log_teardown(chip); > } > > static void tpm_del_legacy_sysfs(struct tpm_chip *chip) > diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h > index 4d183c9..4c118a4 100644 > --- a/drivers/char/tpm/tpm.h > +++ b/drivers/char/tpm/tpm.h > @@ -40,6 +40,7 @@ enum tpm_const { > TPM_BUFSIZE = 4096, > TPM_NUM_DEVICES = 65536, > TPM_RETRY = 50, /* 5 seconds */ > + TPM_NUM_EVENT_LOG_FILES = 3, > }; > > enum tpm_timeout { > @@ -171,7 +172,7 @@ struct tpm_chip { > unsigned long duration[3]; /* jiffies */ > bool duration_adjusted; > > - struct dentry **bios_dir; > + struct dentry *bios_dir[TPM_NUM_EVENT_LOG_FILES]; > > const struct attribute_group *groups[3]; > unsigned int groups_cnt; > diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c > index 75e6644..f5e1d06 100644 > --- a/drivers/char/tpm/tpm_eventlog.c > +++ b/drivers/char/tpm/tpm_eventlog.c > @@ -368,54 +368,50 @@ static int is_bad(void *p) > return 0; > } > > -struct dentry **tpm_bios_log_setup(const char *name) > +int tpm_bios_log_setup(struct tpm_chip *chip) > { > - struct dentry **ret = NULL, *tpm_dir, *bin_file, *ascii_file; > + const char *name = dev_name(&chip->dev); > + unsigned int cnt; > > - tpm_dir = securityfs_create_dir(name, NULL); > - if (is_bad(tpm_dir)) > - goto out; > + cnt = 0; > + chip->bios_dir[cnt] = > + securityfs_create_dir(name, NULL); > + if (is_bad(chip->bios_dir[cnt])) > + goto err; > + cnt++; > > - bin_file = > + chip->bios_dir[cnt] = > securityfs_create_file("binary_bios_measurements", > - S_IRUSR | S_IRGRP, tpm_dir, > + S_IRUSR | S_IRGRP, chip->bios_dir[0], > (void *)&tpm_binary_b_measurments_seqops, > &tpm_bios_measurements_ops); > - if (is_bad(bin_file)) > - goto out_tpm; > + if (is_bad(chip->bios_dir[cnt])) > + goto err; > + cnt++; > > - ascii_file = > + chip->bios_dir[cnt] = > securityfs_create_file("ascii_bios_measurements", > - S_IRUSR | S_IRGRP, tpm_dir, > + S_IRUSR | S_IRGRP, chip->bios_dir[0], > (void *)&tpm_ascii_b_measurments_seqops, > &tpm_bios_measurements_ops); > - if (is_bad(ascii_file)) > - goto out_bin; > + if (is_bad(chip->bios_dir[cnt])) > + goto err; > + cnt++; > > - ret = kmalloc(3 * sizeof(struct dentry *), GFP_KERNEL); > - if (!ret) > - goto out_ascii; > - > - ret[0] = ascii_file; > - ret[1] = bin_file; > - ret[2] = tpm_dir; > - > - return ret; > + return 0; > > -out_ascii: > - securityfs_remove(ascii_file); > -out_bin: > - securityfs_remove(bin_file); > -out_tpm: > - securityfs_remove(tpm_dir); > -out: > - return NULL; > +err: > + chip->bios_dir[cnt] = NULL; The updated patch looks fine. Just, I am not sure if NULL assignment is needed. > + tpm_bios_log_teardown(chip); > + return -EIO; > } > > -void tpm_bios_log_teardown(struct dentry **lst) > +void tpm_bios_log_teardown(struct tpm_chip *chip) > { > int i; > > - for (i = 0; i < 3; i++) > - securityfs_remove(lst[i]); > + for (i = (TPM_NUM_EVENT_LOG_FILES - 1); i >= 0; i--) { > + if (chip->bios_dir[i]) Probably, this check is not required because securityfs_remove() takes care of checking both NULL and err dentry. Thanks & Regards, - Nayna > + securityfs_remove(chip->bios_dir[i]); > + } > } > diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h > index 8de62b0..fd3357e 100644 > --- a/drivers/char/tpm/tpm_eventlog.h > +++ b/drivers/char/tpm/tpm_eventlog.h > @@ -77,14 +77,14 @@ int read_log(struct tpm_bios_log *log); > > #if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \ > defined(CONFIG_ACPI) > -extern struct dentry **tpm_bios_log_setup(const char *); > -extern void tpm_bios_log_teardown(struct dentry **); > +extern int tpm_bios_log_setup(struct tpm_chip *chip); > +extern void tpm_bios_log_teardown(struct tpm_chip *chip); > #else > -static inline struct dentry **tpm_bios_log_setup(const char *name) > +static inline int tpm_bios_log_setup(struct tpm_chip *chip) > { > - return NULL; > + return 0; > } > -static inline void tpm_bios_log_teardown(struct dentry **dir) > +static inline void tpm_bios_log_teardown(struct tpm_chip *chip) > { > } > #endif >