Merge branch '2.6.36-fixes' of git://github.com/schandinat/linux-2.6

* '2.6.36-fixes' of git://github.com/schandinat/linux-2.6: drivers/video/via/ioctl.c: prevent reading uninitialized stack memory
mariux64 · Sep 16, 2010 · 1f0ce99 · 1f0ce99
2 parents bd12e5c + b4aaa78
commit 1f0ce99
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c
@@ -25,6 +25,8 @@ int viafb_ioctl_get_viafb_info(u_long arg)
 {
 	struct viafb_ioctl_info viainfo;
 
+	memset(&viainfo, 0, sizeof(struct viafb_ioctl_info));
+
 	viainfo.viafb_id = VIAID;
 	viainfo.vendor_id = PCI_VIA_VENDOR_ID;