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

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

Linus Torvalds 14 years ago

parent

bd12e5c3a1 b4aaa78f4c

commit

1f0ce990f0

1 changed files with 2 additions and 0 deletions

Split View Show Diff Stats

						
							+ 2
							
							- 0
						
drivers/video/via/ioctl.c
							 
								View File
							
				@@ -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;