Commit 1f0ce990 authored by Linus Torvalds's avatar Linus Torvalds

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
parents bd12e5c3 b4aaa78f
...@@ -25,6 +25,8 @@ int viafb_ioctl_get_viafb_info(u_long arg) ...@@ -25,6 +25,8 @@ int viafb_ioctl_get_viafb_info(u_long arg)
{ {
struct viafb_ioctl_info viainfo; struct viafb_ioctl_info viainfo;
memset(&viainfo, 0, sizeof(struct viafb_ioctl_info));
viainfo.viafb_id = VIAID; viainfo.viafb_id = VIAID;
viainfo.vendor_id = PCI_VIA_VENDOR_ID; viainfo.vendor_id = PCI_VIA_VENDOR_ID;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment