Re: 2.6.14-rc1: oops during boot

["Antonino A. Daplas" <adaplas@gmail.com>]

Grant Wilson wrote:
> 2.6.14-rc1 oops on boot as a result of the patch "nvidiafb: Fallback to
> firmware EDID".
> 
> This is because the call to fb_firmware_edid added by the patch may
> return NULL but this is not checked before trying to memcpy using this
> pointer resulting in the following oops:
> 

Thanks.  Try this patch.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
---

diff --git a/drivers/video/nvidia/nv_i2c.c b/drivers/video/nvidia/nv_i2c.c
--- a/drivers/video/nvidia/nv_i2c.c
+++ b/drivers/video/nvidia/nv_i2c.c
@@ -209,10 +209,13 @@ int nvidia_probe_i2c_connector(struct fb
 
 	if (!edid && conn == 1) {
 		/* try to get from firmware */
-		edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
-		if (edid)
-			memcpy(edid, fb_firmware_edid(info->device),
-			       EDID_LENGTH);
+		const u8 *e = fb_firmware_edid(info->device);
+		
+		if (e != NULL) {
+			edid = kmalloc(EDID_LENGTH, GFP_KERNEL);
+			if (edid)
+				memcpy(edid, e, EDID_LENGTH);
+		}
 	}
 
 	if (out_edid)