git.openwrt.org Git - openwrt/staging/adrian.git/blob

   1 From 60ef8af4bc2d5f8643adbcb69bb1f52e491a96ae Mon Sep 17 00:00:00 2001
   2 From: Dave Stevenson <dave.stevenson@raspberrypi.com>
   3 Date: Mon, 27 Jan 2020 10:22:44 +0000
   4 Subject: [PATCH] drm: Checking of the pitch is only valid for linear
   5  formats
   6
   7 framebuffer_check was computing a minimum pitch value and ensuring
   8 that the provided value was greater than this.
   9 That check is only valid if the format is linear.
  10
  11 Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
  12 ---
  13  drivers/gpu/drm/drm_framebuffer.c | 16 ++++++++++------
  14  1 file changed, 10 insertions(+), 6 deletions(-)
  15
  16 --- a/drivers/gpu/drm/drm_framebuffer.c
  17 +++ b/drivers/gpu/drm/drm_framebuffer.c
  18 @@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_
  19                 if (min_pitch > UINT_MAX)
  20                         return -ERANGE;
  21
  22 -               if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX)
  23 -                       return -ERANGE;
  24 +               if (r->modifier[i] == DRM_FORMAT_MOD_LINEAR) {
  25 +                       if ((uint64_t)height * r->pitches[i] + r->offsets[i] >
  26 +                                                               UINT_MAX)
  27 +                               return -ERANGE;
  28
  29 -               if (block_size && r->pitches[i] < min_pitch) {
  30 -                       DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
  31 -                       return -EINVAL;
  32 +                       if (block_size && r->pitches[i] < min_pitch) {
  33 +                               DRM_DEBUG_KMS("bad pitch %u for plane %d\n",
  34 +                                             r->pitches[i], i);
  35 +                               return -EINVAL;
  36 +                       }
  37                 }
  38
  39                 if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {