Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-29 17:25:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

drm/panic: Fix off-by-one logo size checks

Browse Source 
Logos that are either just as wide or just as high as the display work
fine.

Fixes: bf9fb17c66 ("drm/panic: Add a drm panic handler")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Jocelyn Falempe <jfalempe@redhat.com>
Signed-off-by: Jocelyn Falempe <jfalempe@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1c9d02463cef3eac22cfac3ac6d1adad369f367b.1718305355.git.geert+renesas@glider.be
This commit is contained in:
Geert Uytterhoeven 2024-06-13 21:18:00 +02:00 committed by Jocelyn Falempe
parent a63ee07883
commit 94ff11d3bd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/drm_panic.c
View File

@ -472,7 +472,7 @@ static void draw_panic_static_user(struct drm_scanout_buffer *sb)
drm_panic_fill(sb, &r_screen, bg_color); drm_panic_fill(sb, &r_screen, bg_color);
if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >= drm_rect_height(&r_logo)) && if ((r_msg.x1 >= drm_rect_width(&r_logo) || r_msg.y1 >= drm_rect_height(&r_logo)) &&
drm_rect_width(&r_logo) < sb->width && drm_rect_height(&r_logo) < sb->height) { drm_rect_width(&r_logo) <= sb->width && drm_rect_height(&r_logo) <= sb->height) {
draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color); draw_txt_rectangle(sb, font, logo, logo_lines, false, &r_logo, fg_color);
} }
draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color); draw_txt_rectangle(sb, font, panic_msg, msg_lines, true, &r_msg, fg_color);