fbdev: Fix crashes in various fbdev's blank routines

PATCH New Benjamin Herrenschmidt 1 participant 1 message Aug 31, 2006 Framebuffer layer

Share & tools

Benjamin Herrenschmidt

author

2006-08-31 04:05 UTC #0 lore raw

PATCH 1/1 fbdev: Fix crashes in various fbdev's blank routines

The backlight changes that went in 2.6.18 had a bug where they could cause the kernel to access an unitialized pointer when blanking if there is no backlight control on a machine. The bug affects atyfb, aty128fb, nvidiafb and rivafb. radeonfb seems to be ok. This fixes it.

Signed-off-by Benjamin Herrenschmidt <[email protected]>

---

This is a 2.6.18 regression, please merge before release ! It breaks a number of non-laptop powermacs (among others I suppose).

drivers/video/aty/aty128fb.c +4 -1

Index: linux-work/drivers/video/aty/aty128fb.c
===================================================================
@@ -1800,6 +1800,9 @@ static struct backlight_properties aty12
 
 static void aty128_bl_set_power(struct fb_info *info, int power)
 {
+	if (info->bl_dev == NULL)
+		return;
+
 	mutex_lock(&info->bl_mutex);
 	up(&info->bl_dev->sem);
 	info->bl_dev->props->power = power;

@@ -1828,7 +1831,7 @@ static void aty128_bl_init(struct aty128
 	bd = backlight_device_register(name, par, &aty128_bl_data);
 	if (IS_ERR(bd)) {
 		info->bl_dev = NULL;
-		printk("aty128: Backlight registration failed\n");
+		printk(KERN_WARNING "aty128: Backlight registration failed\n");
 		goto error;
 	}

drivers/video/aty/atyfb_base.c +4 -1

Index: linux-work/drivers/video/aty/atyfb_base.c
===================================================================
@@ -2199,6 +2199,9 @@ static struct backlight_properties aty_b
 
 static void aty_bl_set_power(struct fb_info *info, int power)
 {
+	if (info->bl_dev == NULL)
+		return;
+
 	mutex_lock(&info->bl_mutex);
 	up(&info->bl_dev->sem);
 	info->bl_dev->props->power = power;

@@ -2223,7 +2226,7 @@ static void aty_bl_init(struct atyfb_par
 	bd = backlight_device_register(name, par, &aty_bl_data);
 	if (IS_ERR(bd)) {
 		info->bl_dev = NULL;
-		printk("aty: Backlight registration failed\n");
+		printk(KERN_WARNING "aty: Backlight registration failed\n");
 		goto error;
 	}

drivers/video/nvidia/nv_backlight.c +3 -1

Index: linux-work/drivers/video/nvidia/nv_backlight.c
===================================================================
@@ -112,6 +112,8 @@ static struct backlight_properties nvidi
 
 void nvidia_bl_set_power(struct fb_info *info, int power)
 {
+	if (info->bl_dev == NULL)
+		return;
 	mutex_lock(&info->bl_mutex);
 	up(&info->bl_dev->sem);
 	info->bl_dev->props->power = power;

@@ -140,7 +142,7 @@ void nvidia_bl_init(struct nvidia_par *p
 	bd = backlight_device_register(name, par, &nvidia_bl_data);
 	if (IS_ERR(bd)) {
 		info->bl_dev = NULL;
-		printk("nvidia: Backlight registration failed\n");
+		printk(KERN_WARNING "nvidia: Backlight registration failed\n");
 		goto error;
 	}

drivers/video/riva/fbdev.c +4 -1

Index: linux-work/drivers/video/riva/fbdev.c
===================================================================
@@ -354,6 +354,9 @@ static struct backlight_properties riva_
 
 static void riva_bl_set_power(struct fb_info *info, int power)
 {
+	if (info->bl_dev == NULL)
+		return;
+
 	mutex_lock(&info->bl_mutex);
 	up(&info->bl_dev->sem);
 	info->bl_dev->props->power = power;

@@ -382,7 +385,7 @@ static void riva_bl_init(struct riva_par
 	bd = backlight_device_register(name, par, &riva_bl_data);
 	if (IS_ERR(bd)) {
 		info->bl_dev = NULL;
-		printk("riva: Backlight registration failed\n");
+		printk(KERN_WARNING "riva: Backlight registration failed\n");
 		goto error;
 	}

-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security? Get stuff done quickly with pre-integrated technology to make your job easier Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642