Skip to content

Commit

Permalink
firmware: coreboot: Unmap ioregion after device population
Browse files Browse the repository at this point in the history
Both callers of coreboot_table_init() ioremap the pointer that comes in
but they don't unmap the memory on failure. Both of them also fail probe
immediately with the return value of coreboot_table_init(), leaking a
mapping when it fails. The mapping isn't necessary at all after devices
are populated either, so we can just drop the mapping here when we exit
the function. Let's do that to simplify the code a bit and plug the leak.

Cc: Wei-Ning Huang <wnhuang@chromium.org>
Cc: Julius Werner <jwerner@chromium.org>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Samuel Holland <samuel@sholland.org>
Fixes: 570d30c ("firmware: coreboot: Expose the coreboot table as a bus")
Signed-off-by: Stephen Boyd <swboyd@chromium.org>
Reviewed-by: Julius Werner <jwerner@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
bebarino authored and gregkh committed Sep 14, 2018
1 parent 09ed061 commit 20edec3
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions drivers/firmware/google/coreboot_table.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ int coreboot_table_init(struct device *dev, void __iomem *ptr)

if (strncmp(header.signature, "LBIO", sizeof(header.signature))) {
pr_warn("coreboot_table: coreboot table missing or corrupt!\n");
return -ENODEV;
ret = -ENODEV;
goto out;
}

ptr_entry = (void *)ptr_header + header.header_bytes;
Expand All @@ -137,7 +138,8 @@ int coreboot_table_init(struct device *dev, void __iomem *ptr)

ptr_entry += entry.size;
}

out:
iounmap(ptr);
return ret;
}
EXPORT_SYMBOL(coreboot_table_init);
Expand All @@ -146,7 +148,6 @@ int coreboot_table_exit(void)
{
if (ptr_header) {
bus_unregister(&coreboot_bus_type);
iounmap(ptr_header);
ptr_header = NULL;
}

Expand Down

0 comments on commit 20edec3

Please sign in to comment.