diff options
| author | Mark Yao <mark.yao@rock-chips.com> | 2015-09-23 06:34:34 +0200 |
|---|---|---|
| committer | Mark Yao <mark.yao@rock-chips.com> | 2016-01-21 02:14:05 +0100 |
| commit | e3c4abdb3bc9b76bedd416ecc5c27633a2f8afed (patch) | |
| tree | 08a8d1c55b554360c44dee4adb50c7e0ef2d43cb /drivers/gpu | |
| parent | drm/rockchip: explain why we can't wait_for_vblanks (diff) | |
| download | linux-e3c4abdb3bc9b76bedd416ecc5c27633a2f8afed.tar.xz linux-e3c4abdb3bc9b76bedd416ecc5c27633a2f8afed.zip | |
drm/rockchip: fix wrong pitch/size using on gem
args->pitch and args->size may not be set by userspace, sometimes
userspace only malloc args and not memset args to zero, then
args->pitch and args->size is random, it is very danger to use
pitch/size on gem.
pitch's type is u32, and min_pitch's type is int, example,
pitch is 0xffffffff, then pitch < min_pitch return true, then gem will
alloc very very big bufffer, it would eat all the memory and cause kernel
crash.
Stop using pitch/size from args, calc them from other args.
Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c index d908321b94ce..18e07338c6e5 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c @@ -234,13 +234,8 @@ int rockchip_gem_dumb_create(struct drm_file *file_priv, /* * align to 64 bytes since Mali requires it. */ - min_pitch = ALIGN(min_pitch, 64); - - if (args->pitch < min_pitch) - args->pitch = min_pitch; - - if (args->size < args->pitch * args->height) - args->size = args->pitch * args->height; + args->pitch = ALIGN(min_pitch, 64); + args->size = args->pitch * args->height; rk_obj = rockchip_gem_create_with_handle(file_priv, dev, args->size, &args->handle); |