On Wed, 30 Jul, at 12:23:32PM, Josh Triplett wrote: > Gracefully handle failures to allocate memory for the image, which might > be arbitrarily large. > > efi_bgrt_init can fail in various ways as well, usually because the > BIOS-provided BGRT structure does not match expectations. Add > appropriate error messages rather than failing silently. > > Reported-by: Srihari Vijayaraghavan This could really do with an email address appending. > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=81321 > Signed-off-by: Josh Triplett <josh@xxxxxxxxxxxxxxxx> > --- > arch/x86/platform/efi/efi-bgrt.c | 36 ++++++++++++++++++++++++++++++------ > 1 file changed, 30 insertions(+), 6 deletions(-) [...] > @@ -61,14 +81,18 @@ void __init efi_bgrt_init(void) > early_iounmap(image, sizeof(bmp_header)); > bgrt_image_size = bmp_header.size; > > - bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL); > - if (!bgrt_image) > + bgrt_image = kmalloc(bgrt_image_size, GFP_KERNEL | __GFP_NOWARN); > + if (!bgrt_image) { > + pr_err("Ignoring BGRT: failed to allocate memory for image (wanted %zu bytes)\n", > + bgrt_image_size); > return; I'm not sure that using __GFP_NOWARN is the right thing to do here. If for some reason we can't handle the BGRT image we should include checks in the BGRT code, rather than relying on the page-allocation machinery to save us. Let's just use an explicit limit on the size of the BGRT image we're willing to handle. Either way, this hunk shouldn't be mixed in with the improved error logging changes, it needs to be a separate patch. -- Matt Fleming, Intel Open Source Technology Center -- To unsubscribe from this list: send the line "unsubscribe linux-efi" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
