On Mon, Dec 11, 2017 at 06:52:10PM -0700, Nathan Chancellor wrote: > On Mon, Dec 11, 2017 at 11:17:40PM +0100, gregkh@xxxxxxxxxxxxxxxxxxx wrote: > > > > This is a note to let you know that I've just added the patch titled > > > > efi/esrt: Use memunmap() instead of kfree() to free the remapping > > > > to the 4.4-stable tree which can be found at: > > http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary > > > > The filename of the patch is: > > efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch > > and it can be found in the queue-4.4 subdirectory. > > > > If you, or anyone else, feels it should not be added to the stable tree, > > please let <stable@xxxxxxxxxxxxxxx> know about it. > > > > > > From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001 > > From: Pan Bian <bianpan2016@xxxxxxx> > > Date: Wed, 6 Dec 2017 09:50:09 +0000 > > Subject: efi/esrt: Use memunmap() instead of kfree() to free the remapping > > > > From: Pan Bian <bianpan2016@xxxxxxx> > > > > commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream. > > > > The remapping result of memremap() should be freed with memunmap(), not kfree(). > > > > Signed-off-by: Pan Bian <bianpan2016@xxxxxxx> > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx> > > Cc: H. Peter Anvin <hpa@xxxxxxxxx> > > Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx> > > Cc: Matt Fleming <matt@xxxxxxxxxxxxxxxxxxx> > > Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> > > Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx> > > Cc: linux-efi@xxxxxxxxxxxxxxx > > Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@xxxxxxxxxx > > Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx> > > Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> > > > > --- > > drivers/firmware/efi/esrt.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > --- a/drivers/firmware/efi/esrt.c > > +++ b/drivers/firmware/efi/esrt.c > > @@ -442,7 +442,7 @@ err_remove_group: > > err_remove_esrt: > > kobject_put(esrt_kobj); > > err: > > - kfree(esrt); > > + memunmap(esrt); > > esrt = NULL; > > return error; > > } > > > > > > Patches currently in stable-queue which might be from bianpan2016@xxxxxxx are > > > > queue-4.4/efi-esrt-use-memunmap-instead-of-kfree-to-free-the-remapping.patch > > This caused my build to error since it is missing the include statement > added in commit f58a37b2e01f ("efi/esrt: Use memremap not ioremap to > access ESRT table in memory") upstream. Once that was added, everything > appears to be fine. Thanks, now fixed up. greg k-h