The patch titled atmel_lcdfb: disallow setting larger resolution than the framebuffer memory can handle has been added to the -mm tree. Its filename is atmel_lcdfb-disallow-setting-larger-resolution-than-the-framebuffer-memory-can-handle.patch Before you just go and hit "reply", please: a) Consider who else should be cc'ed b) Prefer to cc a suitable mailing list as well c) Ideally: find the original patch on the mailing list and do a reply-to-all to that, adding suitable additional cc's *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/ ------------------------------------------------------ Subject: atmel_lcdfb: disallow setting larger resolution than the framebuffer memory can handle From: Stanislaw Gruszka <stf_xl@xxxxx> Signed-off-by: Stanislaw Gruszka <stf_xl@xxxxx> Cc: Nicolas Ferre <nicolas.ferre@xxxxxxxxx> Cc: Krzysztof Helt <krzysztof.h1@xxxxx> Cc: Haavard Skinnemoen <hskinnemoen@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/video/atmel_lcdfb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff -puN drivers/video/atmel_lcdfb.c~atmel_lcdfb-disallow-setting-larger-resolution-than-the-framebuffer-memory-can-handle drivers/video/atmel_lcdfb.c --- a/drivers/video/atmel_lcdfb.c~atmel_lcdfb-disallow-setting-larger-resolution-than-the-framebuffer-memory-can-handle +++ a/drivers/video/atmel_lcdfb.c @@ -342,6 +342,13 @@ static int atmel_lcdfb_check_var(struct var->transp.offset = var->transp.length = 0; var->xoffset = var->yoffset = 0; + if (info->fix.smem_len) { + unsigned int smem_len = (var->xres_virtual * var->yres_virtual + * ((var->bits_per_pixel + 7) / 8)); + if (smem_len > info->fix.smem_len) + return -EINVAL; + } + /* Saturate vertical and horizontal timings at maximum values */ var->vsync_len = min_t(u32, var->vsync_len, (ATMEL_LCDC_VPW >> ATMEL_LCDC_VPW_OFFSET) + 1); _ Patches currently in -mm which might be from stf_xl@xxxxx are atmel_lcdfb-fix-oops-in-rmmod-when-framebuffer-fails-to-register.patch atmel_lcdfb-disallow-setting-larger-resolution-than-the-framebuffer-memory-can-handle.patch -- To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html