diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-02-23 23:35:06 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-02-28 06:24:35 +0100 |
| commit | 1922756124ddd53846877416d92ba4a802bc658f (patch) | |
| tree | 22b5b5e5457d5eab364cd2c860814b29874e56f7 | |
| parent | Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/g... (diff) | |
| download | linux-1922756124ddd53846877416d92ba4a802bc658f.tar.xz linux-1922756124ddd53846877416d92ba4a802bc658f.zip | |
drm: fix unsigned vs signed comparison issue in modeset ctl ioctl.
This fixes CVE-2011-1013.
Reported-by: Matthiew Herrb (OpenBSD X.org team)
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
| -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 53120a72a48c..28d1d3c24d65 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c @@ -1012,7 +1012,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 fe29aadb129d..348843b80150 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1101,7 +1101,7 @@ struct drm_device { struct platform_device *platformdev; /**< Platform device struture */ 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; |