diff options
| author | Eric Anholt <eric@anholt.net> | 2016-07-26 13:47:15 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-09-15 08:20:27 +0200 |
| commit | e77337a737bd7234a993b0c264f2406fdc166f19 (patch) | |
| tree | 21c35ef71281ff48e34a4024d88ee46fef0f1e14 | |
| parent | 1153f3b7a3acb9042ab220190307417da22aefa3 (diff) | |
| download | linux-stable-e77337a737bd7234a993b0c264f2406fdc166f19.tar.gz linux-stable-e77337a737bd7234a993b0c264f2406fdc166f19.tar.bz2 linux-stable-e77337a737bd7234a993b0c264f2406fdc166f19.zip | |
drm/vc4: Fix oops when userspace hands in a bad BO.
commit 552416c146fadc67cd9b53ef7adf88d3381c43a6 upstream.
We'd end up NULL pointer dereferencing because we didn't take the
error path out in the parent. Fixes igt vc4_lookup_fail test.
Signed-off-by: Eric Anholt <eric@anholt.net>
Fixes: d5b1a78a772f ("drm/vc4: Add support for drawing 3D frames.")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/vc4/vc4_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/vc4/vc4_gem.c b/drivers/gpu/drm/vc4/vc4_gem.c index f9b13b54c86b..78ab08e8f87e 100644 --- a/drivers/gpu/drm/vc4/vc4_gem.c +++ b/drivers/gpu/drm/vc4/vc4_gem.c @@ -575,7 +575,7 @@ vc4_cl_lookup_bos(struct drm_device *dev, fail: drm_free_large(handles); - return 0; + return ret; } static int |