diff options
| author |   Chris Wilson <chris@chris-wilson.co.uk> | 2020-01-23 12:59:34 +0000 |
|---|---|---|
| committer |   Jani Nikula <jani.nikula@intel.com> | 2020-02-11 11:49:45 +0200 |
| commit | 051c89cf4ac487e795d87e6f3b9e0ff788da8fb4 (patch) | |
| tree | b153b1681b30da7f3e831554a9d206266bb12067 | |
| parent | drm/i915: Don't show the blank process name for internal/simulated errors (diff) | |
| download | linux-dev-051c89cf4ac487e795d87e6f3b9e0ff788da8fb4.tar.xz linux-dev-051c89cf4ac487e795d87e6f3b9e0ff788da8fb4.zip | |
drm/i915/gem: Detect overflow in calculating dumb buffer size
To multiply 2 u32 numbers to generate a u64 in C requires a bit of
forewarning for the compiler.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: stable@vger.kernel.org
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200123125934.1401755-1-chris@chris-wilson.co.uk
(cherry picked from commit 0f8f8a64300092852b9361cd835395ee71e6a7d6)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 94f993e4c12f..c2de2f45b459 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -265,7 +265,10 @@ i915_gem_dumb_create(struct drm_file *file, DRM_FORMAT_MOD_LINEAR)) args->pitch = ALIGN(args->pitch, 4096); - args->size = args->pitch * args->height; + if (args->pitch < args->width) + return -EINVAL; + + args->size = mul_u32_u32(args->pitch, args->height); mem_type = INTEL_MEMORY_SYSTEM; if (HAS_LMEM(to_i915(dev))) |