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
15 years ago · 1f0ce990f0
parent bd12e5c3a1 b4aaa78f4c
commit 1f0ce990f0
1 changed files with 2 additions and 0 deletions
--- 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;