From patchwork Tue Aug 30 04:50:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nayna X-Patchwork-Id: 9304833 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 27E66607F0 for ; Tue, 30 Aug 2016 04:51:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 139CC28AB5 for ; Tue, 30 Aug 2016 04:51:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 08AD528AC1; Tue, 30 Aug 2016 04:51:14 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.sourceforge.net (lists.sourceforge.net [216.34.181.88]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1AF9A28AB5 for ; Tue, 30 Aug 2016 04:51:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=sfs-ml-1.v29.ch3.sourceforge.com) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1beb0w-0003Qx-Bd; Tue, 30 Aug 2016 04:51:10 +0000 Received: from sog-mx-3.v43.ch3.sourceforge.com ([172.29.43.193] helo=mx.sourceforge.net) by sfs-ml-1.v29.ch3.sourceforge.com with esmtp (Exim 4.76) (envelope-from ) id 1beb0v-0003Qr-9O for tpmdd-devel@lists.sourceforge.net; Tue, 30 Aug 2016 04:51:09 +0000 X-ACL-Warn: Received: from mx0a-001b2d01.pphosted.com ([148.163.156.1]) by sog-mx-3.v43.ch3.sourceforge.com with esmtps (TLSv1:AES256-SHA:256) (Exim 4.76) id 1beb0u-0006RW-5j for tpmdd-devel@lists.sourceforge.net; Tue, 30 Aug 2016 04:51:09 +0000 Received: from pps.filterd (m0098410.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.16.0.11/8.16.0.11) with SMTP id u7U4hwqM058792 for ; Tue, 30 Aug 2016 00:51:02 -0400 Received: from e28smtp09.in.ibm.com (e28smtp09.in.ibm.com [125.16.236.9]) by mx0a-001b2d01.pphosted.com with ESMTP id 2553648k5g-1 (version=TLSv1.2 cipher=AES256-SHA bits=256 verify=NOT) for ; Tue, 30 Aug 2016 00:51:02 -0400 Received: from localhost by e28smtp09.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Tue, 30 Aug 2016 10:20:58 +0530 Received: from d28dlp02.in.ibm.com (9.184.220.127) by e28smtp09.in.ibm.com (192.168.1.139) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Tue, 30 Aug 2016 10:20:55 +0530 X-IBM-Helo: d28dlp02.in.ibm.com X-IBM-MailFrom: nayna@linux.vnet.ibm.com X-IBM-RcptTo: tpmdd-devel@lists.sourceforge.net Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp02.in.ibm.com (Postfix) with ESMTP id A0935394005E for ; Tue, 30 Aug 2016 10:20:54 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id u7U4ornW22151266 for ; Tue, 30 Aug 2016 10:20:53 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id u7U4orIF022119 for ; Tue, 30 Aug 2016 10:20:53 +0530 Received: from c365f16u1b3.pok.stglabs.ibm.com (c365f16u1b3.pok.stglabs.ibm.com [9.47.77.42]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id u7U4oRi7020851; Tue, 30 Aug 2016 10:20:51 +0530 From: Nayna Jain To: tpmdd-devel@lists.sourceforge.net Date: Tue, 30 Aug 2016 00:50:15 -0400 X-Mailer: git-send-email 2.5.0 In-Reply-To: <1472532619-22170-1-git-send-email-nayna@linux.vnet.ibm.com> References: <1472532619-22170-1-git-send-email-nayna@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 16083004-0060-0000-0000-000001183C1A X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 16083004-0061-0000-0000-00000F35A64A Message-Id: <1472532619-22170-4-git-send-email-nayna@linux.vnet.ibm.com> X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:, , definitions=2016-08-30_02:, , signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 suspectscore=3 malwarescore=0 phishscore=0 adultscore=0 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1604210000 definitions=main-1608300044 X-Headers-End: 1beb0u-0006RW-5j Subject: [tpmdd-devel] [PATCH v3 3/7] tpm: Validate the eventlog access before tpm_bios_log_setup X-BeenThere: tpmdd-devel@lists.sourceforge.net X-Mailman-Version: 2.1.9 Precedence: list List-Id: Tpm Device Driver maintainance List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: tpmdd-devel-bounces@lists.sourceforge.net X-Virus-Scanned: ClamAV using ClamSMTP Currently, securityfs files for eventlog is created irrespective of logs properties exist or not i.e. event log base address and size. This patch will create ascii and bios measurements file only if readlog() is successful. Suggested-by: Jason Gunthorpe Signed-off-by: Nayna Jain --- drivers/char/tpm/Makefile | 10 ++++++---- drivers/char/tpm/tpm-chip.c | 18 ++++-------------- drivers/char/tpm/tpm.h | 4 ++++ drivers/char/tpm/tpm_acpi.c | 14 +++++++------- drivers/char/tpm/tpm_eventlog.c | 36 ++++++++++++------------------------ drivers/char/tpm/tpm_eventlog.h | 17 +++-------------- drivers/char/tpm/tpm_of.c | 12 ++++++------ 7 files changed, 42 insertions(+), 69 deletions(-) diff --git a/drivers/char/tpm/Makefile b/drivers/char/tpm/Makefile index a385fb8..00e48e4 100644 --- a/drivers/char/tpm/Makefile +++ b/drivers/char/tpm/Makefile @@ -2,14 +2,16 @@ # Makefile for the kernel tpm device drivers. # obj-$(CONFIG_TCG_TPM) += tpm.o -tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o +tpm-y := tpm-interface.o tpm-dev.o tpm-sysfs.o tpm-chip.o tpm2-cmd.o \ + tpm_eventlog.o + tpm-$(CONFIG_ACPI) += tpm_ppi.o ifdef CONFIG_ACPI - tpm-y += tpm_eventlog.o tpm_acpi.o + tpm-y += tpm_acpi.o else -ifdef CONFIG_TCG_IBMVTPM - tpm-y += tpm_eventlog.o tpm_of.o +ifdef CONFIG_OF + tpm-y += tpm_of.o endif endif obj-$(CONFIG_TCG_TIS_CORE) += tpm_tis_core.o diff --git a/drivers/char/tpm/tpm-chip.c b/drivers/char/tpm/tpm-chip.c index 1cd1238..307130e 100644 --- a/drivers/char/tpm/tpm-chip.c +++ b/drivers/char/tpm/tpm-chip.c @@ -283,19 +283,9 @@ static int tpm1_chip_register(struct tpm_chip *chip) tpm_sysfs_add_device(chip); - tpm_bios_log_setup(chip); - return 0; } -static void tpm1_chip_unregister(struct tpm_chip *chip) -{ - if (chip->flags & TPM_CHIP_FLAG_TPM2) - return; - - tpm_bios_log_teardown(chip); -} - static void tpm_del_legacy_sysfs(struct tpm_chip *chip) { struct attribute **i; @@ -369,10 +359,8 @@ int tpm_chip_register(struct tpm_chip *chip) tpm_add_ppi(chip); rc = tpm_add_char_device(chip); - if (rc) { - tpm1_chip_unregister(chip); + if (rc) return rc; - } chip->flags |= TPM_CHIP_FLAG_REGISTERED; @@ -382,6 +370,8 @@ int tpm_chip_register(struct tpm_chip *chip) return rc; } + tpm_bios_log_setup(chip); + return 0; } EXPORT_SYMBOL_GPL(tpm_chip_register); @@ -406,7 +396,7 @@ void tpm_chip_unregister(struct tpm_chip *chip) tpm_del_legacy_sysfs(chip); - tpm1_chip_unregister(chip); + tpm_bios_log_teardown(chip); tpm_del_char_device(chip); } EXPORT_SYMBOL_GPL(tpm_chip_unregister); diff --git a/drivers/char/tpm/tpm.h b/drivers/char/tpm/tpm.h index 603a661..032eb7d 100644 --- a/drivers/char/tpm/tpm.h +++ b/drivers/char/tpm/tpm.h @@ -35,6 +35,8 @@ #include #include +#include "tpm_eventlog.h" + enum tpm_const { TPM_MINOR = 224, /* officially assigned */ TPM_BUFSIZE = 4096, @@ -156,6 +158,8 @@ struct tpm_chip { struct rw_semaphore ops_sem; const struct tpm_class_ops *ops; + struct tpm_bios_log log; + unsigned int flags; int dev_num; /* /dev/tpm# */ diff --git a/drivers/char/tpm/tpm_acpi.c b/drivers/char/tpm/tpm_acpi.c index 565a947..05b4e8a 100644 --- a/drivers/char/tpm/tpm_acpi.c +++ b/drivers/char/tpm/tpm_acpi.c @@ -45,14 +45,14 @@ struct acpi_tcpa { }; /* read binary bios log */ -int read_log(struct tpm_bios_log *log) +int read_log(struct tpm_chip *chip) { struct acpi_tcpa *buff; acpi_status status; void __iomem *virt; u64 len, start; - if (log->bios_event_log != NULL) { + if (chip->log.bios_event_log != NULL) { printk(KERN_ERR "%s: ERROR - Eventlog already initialized\n", __func__); @@ -86,23 +86,23 @@ int read_log(struct tpm_bios_log *log) } /* malloc EventLog space */ - log->bios_event_log = kmalloc(len, GFP_KERNEL); - if (!log->bios_event_log) { + chip->log.bios_event_log = kmalloc(len, GFP_KERNEL); + if (!chip->log.bios_event_log) { printk("%s: ERROR - Not enough Memory for BIOS measurements\n", __func__); return -ENOMEM; } - log->bios_event_log_end = log->bios_event_log + len; + chip->log.bios_event_log_end = chip->log.bios_event_log + len; virt = acpi_os_map_iomem(start, len); if (!virt) { - kfree(log->bios_event_log); + kfree(chip->log.bios_event_log); printk("%s: ERROR - Unable to map memory\n", __func__); return -EIO; } - memcpy_fromio(log->bios_event_log, virt, len); + memcpy_fromio(chip->log.bios_event_log, virt, len); acpi_os_unmap_iomem(virt, len); return 0; diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index 9dd69a7..d6f2477 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -261,14 +261,6 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) static int tpm_bios_measurements_release(struct inode *inode, struct file *file) { - struct seq_file *seq = file->private_data; - struct tpm_bios_log *log = seq->private; - - if (log) { - kfree(log->bios_event_log); - kfree(log); - } - return seq_release(inode, file); } @@ -323,34 +315,22 @@ static int tpm_bios_measurements_open(struct inode *inode, struct file *file) { int err; - struct tpm_bios_log *log; struct seq_file *seq; + struct tpm_chip *chip; const struct seq_operations *seqops = (const struct seq_operations *)inode->i_private; - log = kzalloc(sizeof(struct tpm_bios_log), GFP_KERNEL); - if (!log) - return -ENOMEM; - - err = read_log(log); - if (err) - goto out_free; + chip = (struct tpm_chip + *)file->f_path.dentry->d_parent->d_inode->i_private; /* now register seq file */ err = seq_open(file, seqops); if (!err) { seq = file->private_data; - seq->private = log; - } else { - goto out_free; + seq->private = &chip->log; } -out: return err; -out_free: - kfree(log->bios_event_log); - kfree(log); - goto out; } static const struct file_operations tpm_bios_measurements_ops = { @@ -372,12 +352,18 @@ static int is_bad(void *p) void tpm_bios_log_setup(struct tpm_chip *chip) { const char *name = dev_name(&chip->dev); + int rc = 0; + + rc = read_log(chip); + if (rc < 0) + return; chip->bios_dir_count = 0; chip->bios_dir[chip->bios_dir_count] = securityfs_create_dir(name, NULL); if (is_bad(chip->bios_dir[chip->bios_dir_count])) goto err; + chip->bios_dir[chip->bios_dir_count]->d_inode->i_private = chip; chip->bios_dir_count++; chip->bios_dir[chip->bios_dir_count] = @@ -410,4 +396,6 @@ void tpm_bios_log_teardown(struct tpm_chip *chip) for (i = chip->bios_dir_count; i > 0; --i) securityfs_remove(chip->bios_dir[i-1]); + + kfree(chip->log.bios_event_log); } diff --git a/drivers/char/tpm/tpm_eventlog.h b/drivers/char/tpm/tpm_eventlog.h index 67621c9..6a01d43 100644 --- a/drivers/char/tpm/tpm_eventlog.h +++ b/drivers/char/tpm/tpm_eventlog.h @@ -73,20 +73,9 @@ enum tcpa_pc_event_ids { HOST_TABLE_OF_DEVICES, }; -int read_log(struct tpm_bios_log *log); +int read_log(struct tpm_chip *chip); -#if defined(CONFIG_TCG_IBMVTPM) || defined(CONFIG_TCG_IBMVTPM_MODULE) || \ - defined(CONFIG_ACPI) -extern void tpm_bios_log_setup(struct tpm_chip *chip); -extern void tpm_bios_log_teardown(struct tpm_chip *chip); -#else -static inline void tpm_bios_log_setup(struct tpm_chip *chip) -{ - chip->bios_dir_count = 0; -} -static inline void tpm_bios_log_teardown(struct tpm_chip *chip) -{ -} -#endif +void tpm_bios_log_setup(struct tpm_chip *chip); +void tpm_bios_log_teardown(struct tpm_chip *chip); #endif diff --git a/drivers/char/tpm/tpm_of.c b/drivers/char/tpm/tpm_of.c index 570f30c..8e77976 100644 --- a/drivers/char/tpm/tpm_of.c +++ b/drivers/char/tpm/tpm_of.c @@ -20,13 +20,13 @@ #include "tpm.h" #include "tpm_eventlog.h" -int read_log(struct tpm_bios_log *log) +int read_log(struct tpm_chip *chip) { struct device_node *np; const u32 *sizep; const u64 *basep; - if (log->bios_event_log != NULL) { + if (chip->log.bios_event_log != NULL) { pr_err("%s: ERROR - Eventlog already initialized\n", __func__); return -EFAULT; } @@ -53,17 +53,17 @@ int read_log(struct tpm_bios_log *log) goto cleanup_eio; } - log->bios_event_log = kmalloc(*sizep, GFP_KERNEL); - if (!log->bios_event_log) { + chip->log.bios_event_log = kmalloc(*sizep, GFP_KERNEL); + if (!chip->log.bios_event_log) { pr_err("%s: ERROR - Not enough memory for BIOS measurements\n", __func__); of_node_put(np); return -ENOMEM; } - log->bios_event_log_end = log->bios_event_log + *sizep; + chip->log.bios_event_log_end = chip->log.bios_event_log + *sizep; - memcpy(log->bios_event_log, __va(*basep), *sizep); + memcpy(chip->log.bios_event_log, __va(*basep), *sizep); of_node_put(np); return 0;