summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorairlied@linux.ie <airlied@linux.ie>2005-03-12 21:38:27 -0800
committerGreg KH <gregkh@suse.de>2005-05-12 10:00:08 -0700
commitc3cccab0d0ba6cc1a28cfcdc3cfbf296fc083a2d (patch)
tree63384cb369767b1da63d8dc5597a38340acb43ea
parenta6dc5ecd6b73c73d833fa2111c581878fb00af87 (diff)
downloadlinux-stable-c3cccab0d0ba6cc1a28cfcdc3cfbf296fc083a2d.tar.gz
linux-stable-c3cccab0d0ba6cc1a28cfcdc3cfbf296fc083a2d.tar.bz2
linux-stable-c3cccab0d0ba6cc1a28cfcdc3cfbf296fc083a2d.zip
[PATCH] drm missing memset can crash X server..
Egbert Eich reported a bug 2673 on bugs.freedesktop.org and tracked it down to a missing memset in the setversion ioctl, this causes X server crashes... From: Egbert Eich <eich@pdx.freedesktop.org> Signed-off-by: Dave Airlie <airlied@linux.ie> Signed-off-by: Chris Wright <chrisw@osdl.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/char/drm/drm_ioctl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/char/drm/drm_ioctl.c b/drivers/char/drm/drm_ioctl.c
index 616850974294..7621b35694db 100644
--- a/drivers/char/drm/drm_ioctl.c
+++ b/drivers/char/drm/drm_ioctl.c
@@ -326,6 +326,8 @@ int drm_setversion(DRM_IOCTL_ARGS)
DRM_COPY_FROM_USER_IOCTL(sv, argp, sizeof(sv));
+ memset(&version, 0, sizeof(version));
+
dev->driver->version(&version);
retv.drm_di_major = DRM_IF_MAJOR;
retv.drm_di_minor = DRM_IF_MINOR;