drm/msm: Fix possible null dereference on failure of get_pages()
authorBen Hutchings <ben.hutchings@codethink.co.uk>
Tue, 3 Apr 2018 22:38:45 +0000 (23:38 +0100)
committerRob Clark <robdclark@gmail.com>
Thu, 19 Apr 2018 14:08:34 +0000 (10:08 -0400)
commit3976626ea3d2011f8fd3f3a47070a8b792018253
tree6d43b91d45c769b2ea415065691673783a41f81f
parentf2f3df0aa8522b5641110bbabe54c79922601476
drm/msm: Fix possible null dereference on failure of get_pages()

Commit 62e3a3e342af changed get_pages() to initialise
msm_gem_object::pages before trying to initialise msm_gem_object::sgt,
so that put_pages() would properly clean up pages in the failure
case.

However, this means that put_pages() now needs to check that
msm_gem_object::sgt is not null before trying to clean it up, and
this check was only applied to part of the cleanup code.  Move
it all into the conditional block.  (Strictly speaking we don't
need to make the kfree() conditional, but since we can't avoid
checking for null ourselves we may as well do so.)

Fixes: 62e3a3e342af ("drm/msm: fix leak in failed get_pages")
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
Reviewed-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@gmail.com>
drivers/gpu/drm/msm/msm_gem.c