These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / video / fbdev / vfb.c

diff --git a/kernel/drivers/video/fbdev/vfb.c b/kernel/drivers/video/fbdev/vfb.c
index 70a897b..b9c2f81 100644 (file)
--- a/kernel/drivers/video/fbdev/vfb.c
+++ b/kernel/drivers/video/fbdev/vfb.c
@@ -51,7 +51,14 @@ static void *rvmalloc(unsigned long size)
        if (!mem)
                return NULL;
 
-       memset(mem, 0, size); /* Clear the ram out, no junk to the user */
+       /*
+        * VFB must clear memory to prevent kernel info
+        * leakage into userspace
+        * VGA-based drivers MUST NOT clear memory if
+        * they want to be able to take over vgacon
+        */
+
+       memset(mem, 0, size);
        adr = (unsigned long) mem;
        while (size > 0) {
                SetPageReserved(vmalloc_to_page((void *)adr));
@@ -490,14 +497,6 @@ static int vfb_probe(struct platform_device *dev)
        if (!(videomemory = rvmalloc(videomemorysize)))
                return retval;
 
-       /*
-        * VFB must clear memory to prevent kernel info
-        * leakage into userspace
-        * VGA-based drivers MUST NOT clear memory if
-        * they want to be able to take over vgacon
-        */
-       memset(videomemory, 0, videomemorysize);
-
        info = framebuffer_alloc(sizeof(u32) * 256, &dev->dev);
        if (!info)
                goto err;