* Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree
@ 2017-12-11 22:17 gregkh
2017-12-12 1:52 ` Nathan Chancellor
0 siblings, 1 reply; 3+ messages in thread
From: gregkh @ 2017-12-11 22:17 UTC (permalink / raw)
To: bianpan2016, ard.biesheuvel, gregkh, hpa, matt, mingo, peterz,
tglx, torvalds
Cc: stable, stable-commits
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@vger.kernel.org> know about it.
>From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001
From: Pan Bian <bianpan2016@163.com>
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@163.com>
commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream.
The remapping result of memremap() should be freed with memunmap(), not kfree().
Signed-off-by: Pan Bian <bianpan2016@163.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Matt Fleming <matt@codeblueprint.co.uk>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linux-efi@vger.kernel.org
Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@linaro.org
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree
2017-12-11 22:17 Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree gregkh
@ 2017-12-12 1:52 ` Nathan Chancellor
2017-12-12 9:11 ` Greg KH
0 siblings, 1 reply; 3+ messages in thread
From: Nathan Chancellor @ 2017-12-12 1:52 UTC (permalink / raw)
To: gregkh
Cc: bianpan2016, ard.biesheuvel, hpa, matt, mingo, peterz, tglx,
torvalds, stable, stable-commits
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 <stable@vger.kernel.org> know about it.
>
>
> From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001
> From: Pan Bian <bianpan2016@163.com>
> 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@163.com>
>
> commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream.
>
> The remapping result of memremap() should be freed with memunmap(), not kfree().
>
> Signed-off-by: Pan Bian <bianpan2016@163.com>
> Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> Cc: H. Peter Anvin <hpa@zytor.com>
> Cc: Linus Torvalds <torvalds@linux-foundation.org>
> Cc: Matt Fleming <matt@codeblueprint.co.uk>
> Cc: Peter Zijlstra <peterz@infradead.org>
> Cc: Thomas Gleixner <tglx@linutronix.de>
> Cc: linux-efi@vger.kernel.org
> Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@linaro.org
> Signed-off-by: Ingo Molnar <mingo@kernel.org>
> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
>
> ---
> 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.
Cheers!
Nathan
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree
2017-12-12 1:52 ` Nathan Chancellor
@ 2017-12-12 9:11 ` Greg KH
0 siblings, 0 replies; 3+ messages in thread
From: Greg KH @ 2017-12-12 9:11 UTC (permalink / raw)
To: Nathan Chancellor
Cc: bianpan2016, ard.biesheuvel, hpa, matt, mingo, peterz, tglx,
torvalds, stable, stable-commits
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 <stable@vger.kernel.org> know about it.
> >
> >
> > From 89c5a2d34bda58319e3075e8e7dd727ea25a435c Mon Sep 17 00:00:00 2001
> > From: Pan Bian <bianpan2016@163.com>
> > 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@163.com>
> >
> > commit 89c5a2d34bda58319e3075e8e7dd727ea25a435c upstream.
> >
> > The remapping result of memremap() should be freed with memunmap(), not kfree().
> >
> > Signed-off-by: Pan Bian <bianpan2016@163.com>
> > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
> > Cc: H. Peter Anvin <hpa@zytor.com>
> > Cc: Linus Torvalds <torvalds@linux-foundation.org>
> > Cc: Matt Fleming <matt@codeblueprint.co.uk>
> > Cc: Peter Zijlstra <peterz@infradead.org>
> > Cc: Thomas Gleixner <tglx@linutronix.de>
> > Cc: linux-efi@vger.kernel.org
> > Link: http://lkml.kernel.org/r/20171206095010.24170-3-ard.biesheuvel@linaro.org
> > Signed-off-by: Ingo Molnar <mingo@kernel.org>
> > Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
> >
> > ---
> > 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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2017-12-12 9:11 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-12-11 22:17 Patch "efi/esrt: Use memunmap() instead of kfree() to free the remapping" has been added to the 4.4-stable tree gregkh
2017-12-12 1:52 ` Nathan Chancellor
2017-12-12 9:11 ` Greg KH
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).