On Fri, Jul 19, 2019 at 07:03:31PM +0900, Greg Kroah-Hartman wrote:
On Thu, Jul 18, 2019 at 11:54:05PM -0400, Sasha Levin wrote:
From: Gen Zhang <blackgod016574@xxxxxxxxx>
[ Upstream commit 84ecc2f6eb1cb12e6d44818f94fa49b50f06e6ac ]
In function con_insert_unipair(), when allocation for p2 and p1[n]
fails, ENOMEM is returned, but previously allocated p1 is not freed,
remains as leaking memory. Thus we should free p1 as well when this
allocation fails.
Signed-off-by: Gen Zhang <blackgod016574@xxxxxxxxx>
Reviewed-by: Kees Cook <keescook@xxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
---
drivers/tty/vt/consolemap.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
No, please do not take this patch, it was reverted in commit
15b3cd8ef46a ("Revert "consolemap: Fix a memory leaking bug in
drivers/tty/vt/consolemap.c"") because it was broken.
Please drop from all of the autosel queues.
Now dropped, thanks!
--
Thanks,
Sasha
