aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Pitre2018-01-15 10:04:22 -0600
committerGreg Kroah-Hartman2018-02-22 08:45:00 -0600
commit7f64e1a80640cd97f4767a57796b033d4f47f4db (patch)
tree974397fde170fd36a1a5941274236b33f3b47412
parent8cbb6ca49a15cc2538bec4648f1faf844ad125ad (diff)
downloadkernel-omap-7f64e1a80640cd97f4767a57796b033d4f47f4db.tar.gz
kernel-omap-7f64e1a80640cd97f4767a57796b033d4f47f4db.tar.xz
kernel-omap-7f64e1a80640cd97f4767a57796b033d4f47f4db.zip
console/dummy: leave .con_font_get set to NULL
commit 724ba8b30b044aa0d94b1cd374fc15806cdd6f18 upstream. 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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/video/console/dummycon.c1
1 files changed, 0 insertions, 1 deletions
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 = {
68 .con_switch = DUMMY, 68 .con_switch = DUMMY,
69 .con_blank = DUMMY, 69 .con_blank = DUMMY,
70 .con_font_set = DUMMY, 70 .con_font_set = DUMMY,
71 .con_font_get = DUMMY,
72 .con_font_default = DUMMY, 71 .con_font_default = DUMMY,
73 .con_font_copy = DUMMY, 72 .con_font_copy = DUMMY,
74 .con_set_palette = DUMMY, 73 .con_set_palette = DUMMY,