diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-20 01:37:12 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-20 01:37:11 -0700 |
| commit | bd4d7e0de51be1848ad0545b52cbea80981e8384 (patch) | |
| tree | 68e84b26a97c36de6d7c24d03adf55417df3d15c /drivers | |
| parent | e650018e4a745984ee78ea593dbc3ec5e579b2d0 (diff) | |
| parent | f88d0c45248bc85301a45deb9bf4b0f7fb2fd884 (diff) | |
Merge "drm/msm: Don't allow zero sized buffer objects"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_gem.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_gem.c b/drivers/gpu/drm/msm/msm_gem.c index 4674c5423cbd..4bee797da746 100644 --- a/drivers/gpu/drm/msm/msm_gem.c +++ b/drivers/gpu/drm/msm/msm_gem.c @@ -778,6 +778,13 @@ struct drm_gem_object *msm_gem_new(struct drm_device *dev, size = PAGE_ALIGN(size); + /* + * Disallow zero sized objects as they make the underlying + * infrastructure grumpy + */ + if (!size) + return ERR_PTR(-EINVAL); + ret = msm_gem_new_impl(dev, size, flags, &obj); if (ret) goto fail; |