aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:56:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-09-16 12:56:48 -0700
commit1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8 (patch)
tree552c8368581d8a3ec12f95bf480075019c824f64
parentbd12e5c3a1927b4b14a30142a563dbe592dfdc16 (diff)
parentb4aaa78f4c2f9cde2f335b14f4ca30b01f9651ca (diff)
downloadmrst-s0i3-test-1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8.tar.gz
mrst-s0i3-test-1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8.tar.xz
mrst-s0i3-test-1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8.zip
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
-rw-r--r--drivers/video/via/ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c
index da03c074e32..4d553d0b8d7 100644
--- 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;