From 916e6a77e44fbe66b98f91f428c0a9f07e0c54f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= Date: Tue, 13 Mar 2012 12:35:40 +0200 Subject: [PATCH] --- yaml --- r: 293783 b: refs/heads/master c: e36fae3889db38f6cacabea3998b9a09320f2ad2 h: refs/heads/master i: 293781: 73d1a88238b2d497b9e51c37ab45357375b6d16b 293779: fd1e7a9f675d89b288bf82b73df8807e3c640d90 293775: 4def6ff58abb4a3deaa21d920678deccce68eff0 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/drm_crtc.c | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index f29b69688718..dba3b05fa3fb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2fcfc75b112e897609faed30bcf80565fb005087 +refs/heads/master: e36fae3889db38f6cacabea3998b9a09320f2ad2 diff --git a/trunk/drivers/gpu/drm/drm_crtc.c b/trunk/drivers/gpu/drm/drm_crtc.c index bbcecdb4e0ad..d11763f7211a 100644 --- a/trunk/drivers/gpu/drm/drm_crtc.c +++ b/trunk/drivers/gpu/drm/drm_crtc.c @@ -1002,6 +1002,13 @@ EXPORT_SYMBOL(drm_mode_config_cleanup); void drm_crtc_convert_to_umode(struct drm_mode_modeinfo *out, struct drm_display_mode *in) { + WARN(in->hdisplay > USHRT_MAX || in->hsync_start > USHRT_MAX || + in->hsync_end > USHRT_MAX || in->htotal > USHRT_MAX || + in->hskew > USHRT_MAX || in->vdisplay > USHRT_MAX || + in->vsync_start > USHRT_MAX || in->vsync_end > USHRT_MAX || + in->vtotal > USHRT_MAX || in->vscan > USHRT_MAX, + "timing values too large for mode info\n"); + out->clock = in->clock; out->hdisplay = in->hdisplay; out->hsync_start = in->hsync_start;