From 4902986c45c7186213b84e8f64b80f9287b6c6e1 Mon Sep 17 00:00:00 2001 From: Jesper Juhl Date: Thu, 16 Aug 2012 00:16:33 +0200 Subject: [PATCH] --- yaml --- r: 329095 b: refs/heads/master c: f334ac8da82478b3f8c52e3c01849ad7fe509d5b h: refs/heads/master i: 329093: f2b165381944c438306906e4105af363fe4341e9 329091: a3a061044658fab0b8b50413d9c7d49db8f3ad23 329087: 96830dfce8cf23d54072e1195ed98f4cfbe8462f v: v3 --- [refs] | 2 +- trunk/drivers/char/tpm/tpm_acpi.c | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 587bc6750077..e9d7c5661099 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 20328b56cdf8fcc79f28c6c50ad8190fc0779e80 +refs/heads/master: f334ac8da82478b3f8c52e3c01849ad7fe509d5b diff --git a/trunk/drivers/char/tpm/tpm_acpi.c b/trunk/drivers/char/tpm/tpm_acpi.c index a1bb5a182df9..fe3fa9431dc9 100644 --- a/trunk/drivers/char/tpm/tpm_acpi.c +++ b/trunk/drivers/char/tpm/tpm_acpi.c @@ -96,6 +96,11 @@ int read_log(struct tpm_bios_log *log) log->bios_event_log_end = log->bios_event_log + len; virt = acpi_os_map_memory(start, len); + if (!virt) { + kfree(log->bios_event_log); + printk("%s: ERROR - Unable to map memory\n", __func__); + return -EIO; + } memcpy(log->bios_event_log, virt, len);