diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:56:48 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 21:56:48 +0200 |
| commit | 1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8 (patch) | |
| tree | 552c8368581d8a3ec12f95bf480075019c824f64 /drivers | |
| parent | Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/... (diff) | |
| parent | drivers/video/via/ioctl.c: prevent reading uninitialized stack memory (diff) | |
| download | linux-1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8.tar.xz linux-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
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/video/via/ioctl.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/video/via/ioctl.c b/drivers/video/via/ioctl.c index da03c074e32a..4d553d0b8d7a 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; |