diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 15:56:48 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-16 15:56:48 -0400 |
| commit | 1f0ce990f0fc1bb92c28ef3f54b55cdf9a17b3a8 (patch) | |
| tree | 552c8368581d8a3ec12f95bf480075019c824f64 /drivers/video | |
| parent | bd12e5c3a1927b4b14a30142a563dbe592dfdc16 (diff) | |
| parent | b4aaa78f4c2f9cde2f335b14f4ca30b01f9651ca (diff) | |
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/video')
| -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) | |||
| 25 | { | 25 | { |
| 26 | struct viafb_ioctl_info viainfo; | 26 | struct viafb_ioctl_info viainfo; |
| 27 | 27 | ||
| 28 | memset(&viainfo, 0, sizeof(struct viafb_ioctl_info)); | ||
| 29 | |||
| 28 | viainfo.viafb_id = VIAID; | 30 | viainfo.viafb_id = VIAID; |
| 29 | viainfo.vendor_id = PCI_VIA_VENDOR_ID; | 31 | viainfo.vendor_id = PCI_VIA_VENDOR_ID; |
| 30 | 32 | ||