diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-06-03 22:36:46 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-06-03 22:36:46 -0700 |
| commit | be36af2b20ca258ce68b6726bead61c068a73594 (patch) | |
| tree | 73fb97dded30668a6c1c3208b471ae9682f9c54d | |
| parent | 0a3cd753f41fae73f31e16c038df78435bb6f8cf (diff) | |
| parent | 0bcaa07af26c3748fe4f838f69f2234b047bdb25 (diff) | |
Merge "drm/msm: fix leak in failed get_pages"
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 4bee797da746..8f2a0eea4c4e 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -113,13 +113,15 @@ static struct page **get_pages(struct drm_gem_object *obj) return p; } + msm_obj->pages = p; + msm_obj->sgt = drm_prime_pages_to_sg(p, npages); if (IS_ERR(msm_obj->sgt)) { - dev_err(dev->dev, "failed to allocate sgt\n"); - return ERR_CAST(msm_obj->sgt); - } + void *ptr = ERR_CAST(msm_obj->sgt); - msm_obj->pages = p; + msm_obj->sgt = NULL; + return ptr; + } /* * Make sure to flush the CPU cache for newly allocated memory @@ -157,7 +159,8 @@ static void put_pages(struct drm_gem_object *obj) msm_obj->flags &= ~MSM_BO_LOCKED; } - sg_free_table(msm_obj->sgt); + if (msm_obj->sgt) + sg_free_table(msm_obj->sgt); kfree(msm_obj->sgt); if (use_pages(obj)) { |