Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'tpmdd-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd
Pull TPM update from Jarkko Sakkinen.
* tag 'tpmdd-next-6.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd:
tpm: Change to kvalloc() in eventlog/acpi.c
+13
-2
+13
-2
drivers/char/tpm/eventlog/acpi.c
+13
-2
drivers/char/tpm/eventlog/acpi.c
···
63
63
return n == 0;
64
64
}
65
65
66
+
static void tpm_bios_log_free(void *data)
67
+
{
68
+
kvfree(data);
69
+
}
70
+
66
71
/* read binary bios log */
67
72
int tpm_read_log_acpi(struct tpm_chip *chip)
68
73
{
···
141
136
}
142
137
143
138
/* malloc EventLog space */
144
-
log->bios_event_log = devm_kmalloc(&chip->dev, len, GFP_KERNEL);
139
+
log->bios_event_log = kvmalloc(len, GFP_KERNEL);
145
140
if (!log->bios_event_log)
146
141
return -ENOMEM;
147
142
···
166
161
goto err;
167
162
}
168
163
164
+
ret = devm_add_action(&chip->dev, tpm_bios_log_free, log->bios_event_log);
165
+
if (ret) {
166
+
log->bios_event_log = NULL;
167
+
goto err;
168
+
}
169
+
169
170
return format;
170
171
171
172
err:
172
-
devm_kfree(&chip->dev, log->bios_event_log);
173
+
tpm_bios_log_free(log->bios_event_log);
173
174
log->bios_event_log = NULL;
174
175
return ret;
175
176
}