On Wed, Jan 25, 2023 at 01:06:31PM -0600, Eddie James wrote: > > On 1/20/23 18:11, Jarkko Sakkinen wrote: > > On Fri, Jan 13, 2023 at 10:10:16AM -0600, Eddie James wrote: > > > Since the bios event log is freed in the device release function, > > > let devres handle the deallocation. This will allow other memory > > > allocation/mapping functions to be used for the bios event log. > > > > > > Signed-off-by: Eddie James <eajames@xxxxxxxxxxxxx> > > > --- > > > drivers/char/tpm/eventlog/acpi.c | 5 +++-- > > > drivers/char/tpm/eventlog/efi.c | 13 +++++++------ > > > drivers/char/tpm/eventlog/of.c | 3 ++- > > > drivers/char/tpm/tpm-chip.c | 1 - > > > 4 files changed, 12 insertions(+), 10 deletions(-) > > > > > > diff --git a/drivers/char/tpm/eventlog/acpi.c b/drivers/char/tpm/eventlog/acpi.c > > > index 0913d3eb8d51..40360e599bc3 100644 > > > --- a/drivers/char/tpm/eventlog/acpi.c > > > +++ b/drivers/char/tpm/eventlog/acpi.c > > > @@ -14,6 +14,7 @@ > > > * Access to the event log extended by the TCG BIOS of PC platform > > > */ > > > +#include <linux/device.h> > > > #include <linux/seq_file.h> > > > #include <linux/fs.h> > > > #include <linux/security.h> > > > @@ -135,7 +136,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip) > > > } > > > /* malloc EventLog space */ > > > - log->bios_event_log = kmalloc(len, GFP_KERNEL); > > > + log->bios_event_log = devm_kmalloc(&chip->dev, len, GFP_KERNEL); > > > if (!log->bios_event_log) > > > return -ENOMEM; > > > @@ -160,7 +161,7 @@ int tpm_read_log_acpi(struct tpm_chip *chip) > > > return format; > > > err: > > > - kfree(log->bios_event_log); > > > + devm_kfree(&chip->dev, log->bios_event_log); > > I wonder do we want to do devm_kfree's at all as the memory is freed during > > detach, i.e. taken care by devres. > > > I think we should since the chip/tpm driver will continue to probe without > the bios event log. Therefore that memory will be wasted if there is some > error during bios log setup. OK, I buy this! For this patch: Tested-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> Reviewed-by: Jarkko Sakkinen <jarkko@xxxxxxxxxx> If you could refine the description for the 2nd, then these would be ready to be picked. > Thanks, > > Eddie BR, Jarkko
