diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-24 08:35:06 +1000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-07 15:17:52 -0800 |
| commit | 40d8d3eb87bccc1987a9e6e8ff1da03383d5155a (patch) | |
| tree | cfb179569f90c04bdfb74649ffab212f314c4df2 | |
| parent | 08020344c3d5632890a14218f2985c89d8d6c9b9 (diff) | |
| download | lwn-40d8d3eb87bccc1987a9e6e8ff1da03383d5155a.tar.gz lwn-40d8d3eb87bccc1987a9e6e8ff1da03383d5155a.zip | |
drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
commit 1922756124ddd53846877416d92ba4a802bc658f upstream.
This fixes CVE-2011-1013.
Reported-by: Matthiew Herrb (OpenBSD X.org team)
Signed-off-by: Dave Airlie <airlied@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/gpu/drm/drm_irq.c | 3 | ||||
| -rw-r--r-- | include/drm/drmP.h | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 332d743a9a8c..c8b5a7baf30e 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -540,7 +540,8 @@ int drm_modeset_ctl(struct drm_device *dev, void *data, struct drm_file *file_priv) { struct drm_modeset_ctl *modeset = data; - int crtc, ret = 0; + int ret = 0; + unsigned int crtc; /* If drm_vblank_init() hasn't been called yet, just no-op */ if (!dev->num_crtcs) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index 7ad3faa5dde7..66713c6649a6 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1016,7 +1016,7 @@ struct drm_device { struct pci_controller *hose; #endif struct drm_sg_mem *sg; /**< Scatter gather memory */ - int num_crtcs; /**< Number of CRTCs on this device */ + unsigned int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ void *mm_private; struct address_space *dev_mapping; |