Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEgbert Eich <eich@suse.de>2011-10-12 11:42:57 +0200
committerEgbert Eich <eich@suse.de>2011-10-12 11:42:57 +0200
commit2fc2aaf9b6e1d7e7c8eb49347885317da97ca7ce (patch)
tree1941c7ebd49712ebc2d1c9b16f6cc041bf44bc22
parentd4a7ce4367bc69f763c0e016ba8a34efcbe85026 (diff)
SUSE-bootsplash: Don't crash when splash is turned off.
Fix crash when splash is off (ie. (struct fb_info *)->splash_data == NULL) but someone tries to manipulate the splash image thru the /proc interface. All other functions in render.c seem to be save - ie. upper level code already protects them from being called if the splash_data member is NULL (bnc #718666).
-rw-r--r--patches.suse/SUSE-bootsplash7
1 files changed, 3 insertions, 4 deletions
diff --git a/patches.suse/SUSE-bootsplash b/patches.suse/SUSE-bootsplash
index 1bd33d99ea..babca96053 100644
--- a/patches.suse/SUSE-bootsplash
+++ b/patches.suse/SUSE-bootsplash
@@ -36,7 +36,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
drivers/video/console/bitblit.c | 31
drivers/video/console/fbcon.c | 58
drivers/video/console/fbcon.h | 47
- include/linux/bootsplash.h | 86 +
+ include/linux/bootsplash.h | 85 +
include/linux/console_struct.h | 3
include/linux/fb.h | 4
17 files changed, 4351 insertions(+)
@@ -1419,7 +1419,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
+ vc->vc_splash_data->imgd->splash_fg_color;
+ if (vc->vc_def_color != color)
+ con_remap_def_color(vc, color);
-+ if (info && fg_console == vc->vc_num)
++ if (info && info->splash_data && fg_console == vc->vc_num)
+ splash_update_redraw(vc, info);
+ vc->vc_splash_data->color_set = 1;
+ return 0;
@@ -4509,7 +4509,7 @@ Signed-off-by: Egbert Eich <eich@suse.de>
const u_char *fontdata;
--- /dev/null
+++ linux-3.1-rc6-master/include/linux/bootsplash.h
-@@ -0,0 +1,86 @@
+@@ -0,0 +1,85 @@
+/*
+ * linux/drivers/video/bootsplash/bootsplash.h - splash screen definition.
+ *
@@ -4588,7 +4588,6 @@ Signed-off-by: Egbert Eich <eich@suse.de>
+# define splash_clear(vc, info, sy, sx, height, width)
+# define splash_clear_margins(vc, info, bottom_only)
+# define splash_putcs(vc, info, s, count, ypos, xpos)
-+# define splash_clear_margins(vc, info, bottom_only)
+
+# define SPLASH_DATA(x) 0
+# define TEXT_WIDTH_FROM_SPLASH_DATA(x) 0