Commit 7e13256d authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-misc-next-fixes-2020-10-20' of...

Merge tag 'drm-misc-next-fixes-2020-10-20' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Two patches to prevent out-of-bands accesses on fonts buffers
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020141445.4jisqylfbusdnzge@gilmour
parents 40b99050 272d7089
...@@ -81,7 +81,7 @@ C. Boot options ...@@ -81,7 +81,7 @@ C. Boot options
1. fbcon=font:<name> 1. fbcon=font:<name>
Select the initial font to use. The value 'name' can be any of the Select the initial font to use. The value 'name' can be any of the
compiled-in fonts: 10x18, 6x10, 7x14, Acorn8x8, MINI4x6, compiled-in fonts: 10x18, 6x10, 6x8, 7x14, Acorn8x8, MINI4x6,
PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8. PEARL8x8, ProFont6x11, SUN12x22, SUN8x16, TER16x32, VGA8x16, VGA8x8.
Note, not all drivers can handle font with widths not divisible by 8, Note, not all drivers can handle font with widths not divisible by 8,
......
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
#define FONTDATAMAX 2048 #define FONTDATAMAX 2048
static const unsigned char fontdata_6x8[FONTDATAMAX] = { static struct font_data fontdata_6x8 = {
{ 0, 0, FONTDATAMAX, 0 }, {
/* 0 0x00 '^@' */ /* 0 0x00 '^@' */
0x00, /* 000000 */ 0x00, /* 000000 */
0x00, /* 000000 */ 0x00, /* 000000 */
...@@ -2564,13 +2564,13 @@ static const unsigned char fontdata_6x8[FONTDATAMAX] = { ...@@ -2564,13 +2564,13 @@ static const unsigned char fontdata_6x8[FONTDATAMAX] = {
0x00, /* 000000 */ 0x00, /* 000000 */
0x00, /* 000000 */ 0x00, /* 000000 */
0x00, /* 000000 */ 0x00, /* 000000 */
}; } };
const struct font_desc font_6x8 = { const struct font_desc font_6x8 = {
.idx = FONT6x8_IDX, .idx = FONT6x8_IDX,
.name = "6x8", .name = "6x8",
.width = 6, .width = 6,
.height = 8, .height = 8,
.data = fontdata_6x8, .data = fontdata_6x8.data,
.pref = 0, .pref = 0,
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment