[added,to,the,4.1,stable,tree] console/dummy: leave .con_font_get set to NULL

Message ID 20180301152116.1486-370-alexander.levin@microsoft.com
State New
Headers show
Series
  • [added,to,the,4.1,stable,tree] console/dummy: leave .con_font_get set to NULL
Related show

Commit Message

Sasha Levin March 1, 2018, 3:26 p.m.
From: Nicolas Pitre <nicolas.pitre@linaro.org>


This patch has been added to the 4.1 stable tree. If you have any
objections, please let us know.

-- 
2.14.1

Patch

===============

[ Upstream commit 724ba8b30b044aa0d94b1cd374fc15806cdd6f18 ]

When this method is set, the caller expects struct console_font fields
to be properly initialized when it returns. Leave it unset otherwise
nonsensical (leaked kernel stack) values are returned to user space.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Cc: stable@vger.kernel.org
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
---
 drivers/video/console/dummycon.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c
index 0efc52f11ad0..b30e7d87804b 100644
--- a/drivers/video/console/dummycon.c
+++ b/drivers/video/console/dummycon.c
@@ -68,7 +68,6 @@  const struct consw dummy_con = {
     .con_switch =	DUMMY,
     .con_blank =	DUMMY,
     .con_font_set =	DUMMY,
-    .con_font_get =	DUMMY,
     .con_font_default =	DUMMY,
     .con_font_copy =	DUMMY,
     .con_set_palette =	DUMMY,