Skip to content

Commit 0621d25

Browse files
jarkkojsgregkh
authored andcommitted
tpm: Change to kvalloc() in eventlog/acpi.c
[ Upstream commit a3a860bc0fd6c07332e4911cf9a238d20de90173 ] The following failure was reported on HPE ProLiant D320: [ 10.693310][ T1] tpm_tis STM0925:00: 2.0 TPM (device-id 0x3, rev-id 0) [ 10.848132][ T1] ------------[ cut here ]------------ [ 10.853559][ T1] WARNING: CPU: 59 PID: 1 at mm/page_alloc.c:4727 __alloc_pages_noprof+0x2ca/0x330 [ 10.862827][ T1] Modules linked in: [ 10.866671][ T1] CPU: 59 UID: 0 PID: 1 Comm: swapper/0 Not tainted 6.12.0-lp155.2.g52785e2-default #1 openSUSE Tumbleweed (unreleased) 588cd98293a7c9eba9013378d807364c088c9375 [ 10.882741][ T1] Hardware name: HPE ProLiant DL320 Gen12/ProLiant DL320 Gen12, BIOS 1.20 10/28/2024 [ 10.892170][ T1] RIP: 0010:__alloc_pages_noprof+0x2ca/0x330 [ 10.898103][ T1] Code: 24 08 e9 4a fe ff ff e8 34 36 fa ff e9 88 fe ff ff 83 fe 0a 0f 86 b3 fd ff ff 80 3d 01 e7 ce 01 00 75 09 c6 05 f8 e6 ce 01 01 <0f> 0b 45 31 ff e9 e5 fe ff ff f7 c2 00 00 08 00 75 42 89 d9 80 e1 [ 10.917750][ T1] RSP: 0000:ffffb7cf40077980 EFLAGS: 00010246 [ 10.923777][ T1] RAX: 0000000000000000 RBX: 0000000000040cc0 RCX: 0000000000000000 [ 10.931727][ T1] RDX: 0000000000000000 RSI: 000000000000000c RDI: 0000000000040cc0 The above transcript shows that ACPI pointed a 16 MiB buffer for the log events because RSI maps to the 'order' parameter of __alloc_pages_noprof(). Address the bug by moving from devm_kmalloc() to devm_add_action() and kvmalloc() and devm_add_action(). Suggested-by: Ard Biesheuvel <ardb@kernel.org> Cc: stable@vger.kernel.org # v2.6.16+ Fixes: 55a82ab ("[PATCH] tpm: add bios measurement log") Reported-by: Andy Liang <andy.liang@hpe.com> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=219495 Reviewed-by: Ard Biesheuvel <ardb@kernel.org> Reviewed-by: Stefan Berger <stefanb@linux.ibm.com> Reviewed-by: Takashi Iwai <tiwai@suse.de> Tested-by: Andy Liang <andy.liang@hpe.com> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 906ac47 commit 0621d25

File tree

1 file changed

+13
-2
lines changed
  • drivers/char/tpm/eventlog

1 file changed

+13
-2
lines changed

drivers/char/tpm/eventlog/acpi.c

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,11 @@ static bool tpm_is_tpm2_log(void *bios_event_log, u64 len)
6363
return n == 0;
6464
}
6565

66+
static void tpm_bios_log_free(void *data)
67+
{
68+
kvfree(data);
69+
}
70+
6671
/* read binary bios log */
6772
int tpm_read_log_acpi(struct tpm_chip *chip)
6873
{
@@ -136,7 +141,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
136141
}
137142

138143
/* malloc EventLog space */
139-
log->bios_event_log = devm_kmalloc(&chip->dev, len, GFP_KERNEL);
144+
log->bios_event_log = kvmalloc(len, GFP_KERNEL);
140145
if (!log->bios_event_log)
141146
return -ENOMEM;
142147

@@ -162,10 +167,16 @@ int tpm_read_log_acpi(struct tpm_chip *chip)
162167
goto err;
163168
}
164169

170+
ret = devm_add_action(&chip->dev, tpm_bios_log_free, log->bios_event_log);
171+
if (ret) {
172+
log->bios_event_log = NULL;
173+
goto err;
174+
}
175+
165176
return format;
166177

167178
err:
168-
devm_kfree(&chip->dev, log->bios_event_log);
179+
tpm_bios_log_free(log->bios_event_log);
169180
log->bios_event_log = NULL;
170181
return ret;
171182
}

0 commit comments

Comments
 (0)