diff options
| author |  Eric Anholt <eric@anholt.net>
| 2017-01-17 21:42:53 +1100 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net>
| 2017-01-17 22:05:55 +1100 |
| commit | 0f2ff82e11c86c05d051cae32b58226392d33bbf (patch) | |
| tree | a902de69d6b8d2aacae17a8549bffe959037d0e2 /drivers/gpu | |
| parent | drm/vc4: fix a bounds check (diff) | |
| download | linux-0f2ff82e11c86c05d051cae32b58226392d33bbf.tar.gz linux-0f2ff82e11c86c05d051cae32b58226392d33bbf.tar.bz2 linux-0f2ff82e11c86c05d051cae32b58226392d33bbf.zip | |
drm/vc4: Fix an integer overflow in temporary allocation layout.
We copy the unvalidated ioctl arguments from the user into kernel
temporary memory to run the validation from, to avoid a race where the
user updates the unvalidate contents in between validating them and
copying them into the validated BO.
However, in setting up the layout of the kernel side, we failed to
check one of the additions (the roundup() for shader_rec_offset)
against integer overflow, allowing a nearly MAX_UINT value of
bin_cl_size to cause us to under-allocate the temporary space that we
then copy_from_user into.
Reported-by: Murray McAllister <murray.mcallister@insomniasec.com>
Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index db920771bfb5..c5fe3554858e 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -594,7 +594,8 @@ vc4_get_bcl(struct drm_device *dev, struct vc4_exec_info *exec) args->shader_rec_count); struct vc4_bo *bo; - if (uniforms_offset < shader_rec_offset || + if (shader_rec_offset < args->bin_cl_size || + uniforms_offset < shader_rec_offset || exec_size < uniforms_offset || args->shader_rec_count >= (UINT_MAX / sizeof(struct vc4_shader_state)) || |