From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:36514 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751499AbdLLJLN (ORCPT ); Tue, 12 Dec 2017 04:11:13 -0500 Date: Tue, 12 Dec 2017 10:11:20 +0100 From: Greg KH To: Nathan Chancellor Cc: bianpan2016@163.com, ard.biesheuvel@linaro.org, hpa@zytor.com, matt@codeblueprint.co.uk, mingo@kernel.org, peterz@infradead.org, tglx@linutronix.de, torvalds@linux-foundation.org, stable@vger.kernel.org, stable-commits@vger.kernel.org Subject: Re: Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree Message-ID: <20171212091120.GA5113@kroah.com> References: <1513030660255166@kroah.com> <20171212015210.GA13830@flashbox> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171212015210.GA13830@flashbox> Sender: stable-owner@vger.kernel.org List-ID: On Mon, Dec 11, 2017 at 06:52:10PM -0700, Nathan Chancellor wrote: > On Mon, Dec 11, 2017 at 11:17:40PM +0100, gregkh@linuxfoundation.org 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 know about it. > > > > > > From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001 > > From: Pan Bian > > Date: Wed, 6 Dec 2017 09:50:09 +0000 > > Subject: efi/esrt: Use memunmap() instead of kfree() to free the remapping > > > > From: Pan Bian > > > > commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream. > > > > The remapping result of memremap() should be freed with memunmap(), not kfree(). > > > > Signed-off-by: Pan Bian > > Signed-off-by: Ard Biesheuvel > > Cc: H. Peter Anvin > > Cc: Linus Torvalds > > Cc: Matt Fleming > > Cc: Peter Zijlstra > > Cc: Thomas Gleixner > > Cc: linux-efi@vger.kernel.org > > Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@linaro.org > > Signed-off-by: Ingo Molnar > > Signed-off-by: Greg Kroah-Hartman > > > > --- > > 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@163.com 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