From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751601AbcBMNrn (ORCPT ); Sat, 13 Feb 2016 08:47:43 -0500 Received: from mga02.intel.com ([134.134.136.20]:60567 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751577AbcBMNrk (ORCPT ); Sat, 13 Feb 2016 08:47:40 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.22,440,1449561600"; d="scan'208";a="47401730" From: Jarkko Sakkinen To: Peter Huewe , Marcel Selhorst , David Howells Cc: jmorris@namei.org, Harald Hoyer , stable@vger.kernel.org, Jarkko Sakkinen , Jason Gunthorpe , tpmdd-devel@lists.sourceforge.net (moderated list:TPM DEVICE DRIVER), linux-kernel@vger.kernel.org (open list) Subject: [PATCH v2 4/4] tpm_eventlog.c: fix binary_bios_measurements Date: Sat, 13 Feb 2016 15:47:07 +0200 Message-Id: <1455371228-20431-5-git-send-email-jarkko.sakkinen@linux.intel.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1455371228-20431-1-git-send-email-jarkko.sakkinen@linux.intel.com> References: <1455371228-20431-1-git-send-email-jarkko.sakkinen@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Harald Hoyer The commit 0cc698af36ff ("vTPM: support little endian guests") copied the event, but without the event data, did an endian conversion on the size and tried to output the event data from the copied version, which has only have one byte of the data, resulting in garbage event data. [jarkko.sakkinen@linux.intel.com: minor coding style fixes] Signed-off-by: Harald Hoyer Fixes: 0cc698af36ff ("vTPM: support little endian guests") cc: stable@vger.kernel.org --- drivers/char/tpm/tpm_eventlog.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/drivers/char/tpm/tpm_eventlog.c b/drivers/char/tpm/tpm_eventlog.c index bd72fb0..6011751 100644 --- a/drivers/char/tpm/tpm_eventlog.c +++ b/drivers/char/tpm/tpm_eventlog.c @@ -242,9 +242,15 @@ static int tpm_binary_bios_measurements_show(struct seq_file *m, void *v) temp_event.event_type = do_endian_conversion(event->event_type); temp_event.event_size = do_endian_conversion(event->event_size); - tempPtr = (char *)&temp_event; + tempPtr = (char *) &temp_event; - for (i = 0; i < sizeof(struct tcpa_event) + temp_event.event_size; i++) + for (i = 0; i < sizeof(struct tcpa_event)-1 ; i++) + seq_putc(m, tempPtr[i]); + + tempPtr = (char *) v; + + for (i = sizeof(struct tcpa_event) - 1; + i < sizeof(struct tcpa_event) + temp_event.event_size; i++) seq_putc(m, tempPtr[i]); return 0; -- 2.7.0