From: Nicolai Stange <nicstange@gmail.com> To: Dave Young <dyoung@redhat.com> Cc: Matt Fleming <matt@codeblueprint.co.uk>, Ard Biesheuvel <ard.biesheuvel@linaro.org>, linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, Nicolai Stange <nicstange@gmail.com>, Ingo Molnar <mingo@kernel.org>, Thomas Gleixner <tglx@linutronix.de>, hpa@zytor.com, Dan Williams <dan.j.williams@intel.com>, mika.penttila@nextfour.com, bhsharma@redhat.com Subject: Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Date: Thu, 12 Jan 2017 12:54:40 +0100 [thread overview] Message-ID: <871sw8pk73.fsf@gmail.com> (raw) In-Reply-To: <20170112094214.909117564@redhat.com> (Dave Young's message of "Thu, 12 Jan 2017 17:41:20 +0800") On Thu, Jan 12 2017, Dave Young wrote: > -void __init efi_bgrt_init(void) > +void __init efi_bgrt_init(struct acpi_table_header *table) > { > - acpi_status status; > void *image; > struct bmp_header bmp_header; > > if (acpi_disabled) > return; > > - status = acpi_get_table("BGRT", 0, > - (struct acpi_table_header **)&bgrt_tab); > - if (ACPI_FAILURE(status)) > - return; Not sure, but wouldn't it be safer to reverse the order of this assignment > + bgrt_tab = *(struct acpi_table_bgrt *)table; and this length check > - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) { > + if (bgrt_tab.header.length < sizeof(bgrt_tab)) { > pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n", > - bgrt_tab->header.length, sizeof(*bgrt_tab)); > + bgrt_tab.header.length, sizeof(bgrt_tab)); > return; > } ? Also, from here on, all error paths should zero out bgrt_tab.image_address (or so) to signal failure to bgrt_init(): bgrt_init() now checks for !bgrt_tab.image_address whereas before it had tested bgrt_image and the latter used to be set at the very end of efi_bgrt_init(). > - if (bgrt_tab->version != 1) { > + if (bgrt_tab.version != 1) { > pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n", > - bgrt_tab->version); > + bgrt_tab.version); > return; > } > - if (bgrt_tab->status & 0xfe) { > + if (bgrt_tab.status & 0xfe) { > pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n", > - bgrt_tab->status); > + bgrt_tab.status); > return; > } > - if (bgrt_tab->image_type != 0) { > + if (bgrt_tab.image_type != 0) { > pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n", > - bgrt_tab->image_type); > + bgrt_tab.image_type); > return; > } > - if (!bgrt_tab->image_address) { > + if (!bgrt_tab.image_address) { > pr_notice("Ignoring BGRT: null image address\n"); > return; > } > > - image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB); > + image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header)); > if (!image) { > pr_notice("Ignoring BGRT: failed to map image header memory\n"); > return; > } > > memcpy(&bmp_header, image, sizeof(bmp_header)); > - memunmap(image); > + early_memunmap(image, sizeof(bmp_header)); > if (bmp_header.id != 0x4d42) { > pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n", > bmp_header.id); > @@ -82,12 +77,5 @@ void __init efi_bgrt_init(void) > } > bgrt_image_size = bmp_header.size; > > - bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB); > - if (!bgrt_image) { > - pr_notice("Ignoring BGRT: failed to map image memory\n"); > - bgrt_image = NULL; > - return; > - } > - > - efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size); > + efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size); > } > --- linux-x86.orig/drivers/acpi/bgrt.c > +++ linux-x86/drivers/acpi/bgrt.c > @@ -15,40 +15,41 @@ > #include <linux/sysfs.h> > #include <linux/efi-bgrt.h> > > +static void *bgrt_image; [...] > @@ -84,9 +85,17 @@ static int __init bgrt_init(void) > { > int ret; > > - if (!bgrt_image) > + if (!bgrt_tab.image_address) > return -ENODEV; > > + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size, > + MEMREMAP_WB); > + if (!bgrt_image) { > + pr_notice("Ignoring BGRT: failed to map image memory\n"); > + bgrt_image = NULL; > + return -ENOMEM; > + } > + > bin_attr_image.private = bgrt_image; > bin_attr_image.size = bgrt_image_size; > Thanks, Nicolai
WARNING: multiple messages have this Message-ID (diff)
From: Nicolai Stange <nicstange-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> To: Dave Young <dyoung-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> Cc: Matt Fleming <matt-mF/unelCI9GS6iBeEJttW/XRex20P6io@public.gmane.org>, Ard Biesheuvel <ard.biesheuvel-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>, linux-efi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, x86-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org, Nicolai Stange <nicstange-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>, Ingo Molnar <mingo-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>, Thomas Gleixner <tglx-hfZtesqFncYOwBW4kG4KsQ@public.gmane.org>, hpa-YMNOUZJC4hwAvxtiuMwx3w@public.gmane.org, Dan Williams <dan.j.williams-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org>, mika.penttila-MRsr7dthA9VWk0Htik3J/w@public.gmane.org, bhsharma-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org Subject: Re: [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Date: Thu, 12 Jan 2017 12:54:40 +0100 [thread overview] Message-ID: <871sw8pk73.fsf@gmail.com> (raw) In-Reply-To: <20170112094214.909117564-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> (Dave Young's message of "Thu, 12 Jan 2017 17:41:20 +0800") On Thu, Jan 12 2017, Dave Young wrote: > -void __init efi_bgrt_init(void) > +void __init efi_bgrt_init(struct acpi_table_header *table) > { > - acpi_status status; > void *image; > struct bmp_header bmp_header; > > if (acpi_disabled) > return; > > - status = acpi_get_table("BGRT", 0, > - (struct acpi_table_header **)&bgrt_tab); > - if (ACPI_FAILURE(status)) > - return; Not sure, but wouldn't it be safer to reverse the order of this assignment > + bgrt_tab = *(struct acpi_table_bgrt *)table; and this length check > - if (bgrt_tab->header.length < sizeof(*bgrt_tab)) { > + if (bgrt_tab.header.length < sizeof(bgrt_tab)) { > pr_notice("Ignoring BGRT: invalid length %u (expected %zu)\n", > - bgrt_tab->header.length, sizeof(*bgrt_tab)); > + bgrt_tab.header.length, sizeof(bgrt_tab)); > return; > } ? Also, from here on, all error paths should zero out bgrt_tab.image_address (or so) to signal failure to bgrt_init(): bgrt_init() now checks for !bgrt_tab.image_address whereas before it had tested bgrt_image and the latter used to be set at the very end of efi_bgrt_init(). > - if (bgrt_tab->version != 1) { > + if (bgrt_tab.version != 1) { > pr_notice("Ignoring BGRT: invalid version %u (expected 1)\n", > - bgrt_tab->version); > + bgrt_tab.version); > return; > } > - if (bgrt_tab->status & 0xfe) { > + if (bgrt_tab.status & 0xfe) { > pr_notice("Ignoring BGRT: reserved status bits are non-zero %u\n", > - bgrt_tab->status); > + bgrt_tab.status); > return; > } > - if (bgrt_tab->image_type != 0) { > + if (bgrt_tab.image_type != 0) { > pr_notice("Ignoring BGRT: invalid image type %u (expected 0)\n", > - bgrt_tab->image_type); > + bgrt_tab.image_type); > return; > } > - if (!bgrt_tab->image_address) { > + if (!bgrt_tab.image_address) { > pr_notice("Ignoring BGRT: null image address\n"); > return; > } > > - image = memremap(bgrt_tab->image_address, sizeof(bmp_header), MEMREMAP_WB); > + image = early_memremap(bgrt_tab.image_address, sizeof(bmp_header)); > if (!image) { > pr_notice("Ignoring BGRT: failed to map image header memory\n"); > return; > } > > memcpy(&bmp_header, image, sizeof(bmp_header)); > - memunmap(image); > + early_memunmap(image, sizeof(bmp_header)); > if (bmp_header.id != 0x4d42) { > pr_notice("Ignoring BGRT: Incorrect BMP magic number 0x%x (expected 0x4d42)\n", > bmp_header.id); > @@ -82,12 +77,5 @@ void __init efi_bgrt_init(void) > } > bgrt_image_size = bmp_header.size; > > - bgrt_image = memremap(bgrt_tab->image_address, bmp_header.size, MEMREMAP_WB); > - if (!bgrt_image) { > - pr_notice("Ignoring BGRT: failed to map image memory\n"); > - bgrt_image = NULL; > - return; > - } > - > - efi_mem_reserve(bgrt_tab->image_address, bgrt_image_size); > + efi_mem_reserve(bgrt_tab.image_address, bgrt_image_size); > } > --- linux-x86.orig/drivers/acpi/bgrt.c > +++ linux-x86/drivers/acpi/bgrt.c > @@ -15,40 +15,41 @@ > #include <linux/sysfs.h> > #include <linux/efi-bgrt.h> > > +static void *bgrt_image; [...] > @@ -84,9 +85,17 @@ static int __init bgrt_init(void) > { > int ret; > > - if (!bgrt_image) > + if (!bgrt_tab.image_address) > return -ENODEV; > > + bgrt_image = memremap(bgrt_tab.image_address, bgrt_image_size, > + MEMREMAP_WB); > + if (!bgrt_image) { > + pr_notice("Ignoring BGRT: failed to map image memory\n"); > + bgrt_image = NULL; > + return -ENOMEM; > + } > + > bin_attr_image.private = bgrt_image; > bin_attr_image.size = bgrt_image_size; > Thanks, Nicolai
next prev parent reply other threads:[~2017-01-12 11:54 UTC|newest] Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-01-12 9:41 [PATCH 0/4] efi/x86: move efi bgrt init code to early init Dave Young 2017-01-12 9:41 ` [PATCH 1/4] efi/x86: make efi_memmap_reserve only insert into boot mem areas Dave Young 2017-01-12 9:41 ` Dave Young 2017-01-12 11:15 ` Nicolai Stange 2017-01-12 11:15 ` Nicolai Stange 2017-01-12 21:29 ` Dave Young 2017-01-12 21:29 ` Dave Young 2017-01-27 14:48 ` Matt Fleming 2017-01-27 17:04 ` Ard Biesheuvel 2017-01-27 17:04 ` Ard Biesheuvel 2017-01-27 22:13 ` Matt Fleming 2017-01-27 22:13 ` Matt Fleming 2017-01-27 22:15 ` Ard Biesheuvel 2017-01-27 22:15 ` Ard Biesheuvel 2017-01-12 16:15 ` Ard Biesheuvel 2017-01-12 16:15 ` Ard Biesheuvel 2017-01-12 21:20 ` Dave Young 2017-01-12 21:20 ` Dave Young 2017-01-13 8:10 ` Dave Young 2017-01-12 9:41 ` [PATCH 2/4] efi/x86: move efi bgrt init code to early init code Dave Young 2017-01-12 9:56 ` Dave Young 2017-01-12 11:54 ` Nicolai Stange [this message] 2017-01-12 11:54 ` Nicolai Stange 2017-01-12 21:39 ` Dave Young 2017-01-12 23:11 ` Nicolai Stange 2017-01-12 23:11 ` Nicolai Stange 2017-01-13 2:21 ` Dave Young 2017-01-13 3:04 ` Dave Young 2017-01-13 3:04 ` Dave Young 2017-01-13 12:21 ` Nicolai Stange 2017-01-13 12:21 ` Nicolai Stange 2017-01-16 2:55 ` Dave Young 2017-01-16 2:55 ` Dave Young 2017-01-12 16:20 ` Ard Biesheuvel 2017-01-12 16:20 ` Ard Biesheuvel 2017-01-12 21:33 ` Dave Young 2017-01-12 21:33 ` Dave Young 2017-01-16 15:15 ` Bhupesh Sharma 2017-01-17 17:00 ` Ard Biesheuvel 2017-01-12 9:41 ` [PATCH 3/4] efi/x86: move efi_print_memmap to drivers/firmware/efi/memmap.c Dave Young 2017-01-12 9:41 ` Dave Young 2017-01-12 12:08 ` Nicolai Stange 2017-01-12 21:40 ` Dave Young 2017-01-12 9:41 ` [PATCH 4/4] efi/x86: add debug code to print cooked memmap Dave Young 2017-01-12 16:18 ` Ard Biesheuvel
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=871sw8pk73.fsf@gmail.com \ --to=nicstange@gmail.com \ --cc=ard.biesheuvel@linaro.org \ --cc=bhsharma@redhat.com \ --cc=dan.j.williams@intel.com \ --cc=dyoung@redhat.com \ --cc=hpa@zytor.com \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=matt@codeblueprint.co.uk \ --cc=mika.penttila@nextfour.com \ --cc=mingo@kernel.org \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.