diff options
| author | Dave Airlie <[email protected]> | 2020-10-21 06:52:50 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2020-10-21 06:58:39 +1000 |
| commit | 7e13256dfe22b0d2e49cbfdb75bdc57e059d6c50 (patch) | |
| tree | bd7896c9b19207d74755f46e98eb38cbb33b376e | |
| parent | 40b99050455b9a6cb8faf15dcd41888312184720 (diff) | |
| parent | 272d70895113ef00c03ab325787d159ee51718c8 (diff) | |
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: Dave Airlie <[email protected]>
From: Maxime Ripard <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020141445.4jisqylfbusdnzge@gilmour
| -rw-r--r-- | Documentation/fb/fbcon.rst | 2 | ||||
| -rw-r--r-- | lib/fonts/font_6x8.c | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/fb/fbcon.rst b/Documentation/fb/fbcon.rst index a7b487cba307..71cade19d92c 100644 --- a/Documentation/fb/fbcon.rst +++ b/Documentation/fb/fbcon.rst @@ -81,7 +81,7 @@ C. Boot options 1. fbcon=font:<name> 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. Note, not all drivers can handle font with widths not divisible by 8, diff --git a/lib/fonts/font_6x8.c b/lib/fonts/font_6x8.c index e06447788418..700039a9ceae 100644 --- a/lib/fonts/font_6x8.c +++ b/lib/fonts/font_6x8.c @@ -3,8 +3,8 @@ #define FONTDATAMAX 2048 -static const unsigned char fontdata_6x8[FONTDATAMAX] = { - +static struct font_data fontdata_6x8 = { + { 0, 0, FONTDATAMAX, 0 }, { /* 0 0x00 '^@' */ 0x00, /* 000000 */ 0x00, /* 000000 */ @@ -2564,13 +2564,13 @@ static const unsigned char fontdata_6x8[FONTDATAMAX] = { 0x00, /* 000000 */ 0x00, /* 000000 */ 0x00, /* 000000 */ -}; +} }; const struct font_desc font_6x8 = { .idx = FONT6x8_IDX, .name = "6x8", .width = 6, .height = 8, - .data = fontdata_6x8, + .data = fontdata_6x8.data, .pref = 0, }; |