[PATCH] nv_i2c oops fix

The call to fb_firmware_edid may return NULL but this is not checked before
trying to memcpy using this pointer.

Signed-off-by: Antonino Daplas <adaplas@pol.net>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

authored by Antonino A. Daplas and committed by Linus Torvalds 0ed8e048 8fd9808a

+7 -4
+7 -4
drivers/video/nvidia/nv_i2c.c
··· 209 209 210 210 if (!edid && conn == 1) { 211 211 /* try to get from firmware */ 212 - edid = kmalloc(EDID_LENGTH, GFP_KERNEL); 213 - if (edid) 214 - memcpy(edid, fb_firmware_edid(info->device), 215 - EDID_LENGTH); 212 + const u8 *e = fb_firmware_edid(info->device); 213 + 214 + if (e != NULL) { 215 + edid = kmalloc(EDID_LENGTH, GFP_KERNEL); 216 + if (edid) 217 + memcpy(edid, e, EDID_LENGTH); 218 + } 216 219 } 217 220 218 221 if (out_edid)