40 lines
1.4 KiB
Diff
40 lines
1.4 KiB
Diff
From 60ef8af4bc2d5f8643adbcb69bb1f52e491a96ae Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Mon, 27 Jan 2020 10:22:44 +0000
|
|
Subject: [PATCH] drm: Checking of the pitch is only valid for linear
|
|
formats
|
|
|
|
framebuffer_check was computing a minimum pitch value and ensuring
|
|
that the provided value was greater than this.
|
|
That check is only valid if the format is linear.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/drm_framebuffer.c | 16 ++++++++++------
|
|
1 file changed, 10 insertions(+), 6 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/drm_framebuffer.c
|
|
+++ b/drivers/gpu/drm/drm_framebuffer.c
|
|
@@ -217,12 +217,16 @@ static int framebuffer_check(struct drm_
|
|
if (min_pitch > UINT_MAX)
|
|
return -ERANGE;
|
|
|
|
- if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX)
|
|
- return -ERANGE;
|
|
+ if (r->modifier[i] == DRM_FORMAT_MOD_LINEAR) {
|
|
+ if ((uint64_t)height * r->pitches[i] + r->offsets[i] >
|
|
+ UINT_MAX)
|
|
+ return -ERANGE;
|
|
|
|
- if (block_size && r->pitches[i] < min_pitch) {
|
|
- DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
|
|
- return -EINVAL;
|
|
+ if (block_size && r->pitches[i] < min_pitch) {
|
|
+ DRM_DEBUG_KMS("bad pitch %u for plane %d\n",
|
|
+ r->pitches[i], i);
|
|
+ return -EINVAL;
|
|
+ }
|
|
}
|
|
|
|
if (r->modifier[i] && !(r->flags & DRM_MODE_FB_MODIFIERS)) {
|