UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

Two patches to prevent out-of-bands accesses on fonts buffers 

-----BEGIN PGP SIGNATURE-----
 
 iHUEABYIAB0WIQRcEzekXsqa64kGDp7j7w1vZxhRxQUCX47wnwAKCRDj7w1vZxhR
 xcuwAQCngPTyJmuFrPRqkS6UDDwaeVoBTExZR1+C5g6BIiN2JAEAqFOnp7dSv+Ja
 35cvuS+vTxNPfYpsKm0mcq46GZ2abwQ=
 =WfSm
 -----END PGP SIGNATURE-----

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 <airlied@redhat.com>

From: Maxime Ripard <maxime@cerno.tech>
Link: https://patchwork.freedesktop.org/patch/msgid/20201020141445.4jisqylfbusdnzge@gilmour
This commit is contained in:
Dave Airlie 2020-10-21 06:52:50 +10:00
parent 40b9905045 272d708951
commit 7e13256dfe
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Documentation/fb/fbcon.rst
View File

@ -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,

8
lib/fonts/font_6x8.c
View File

@ -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] = {
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,
}; };