drm/msm: Don't increase priv->num_aspaces until we know that it fits
priv->num_aspaces is increased and then checked to see if it still fits in the priv->aspace array. If it doesn't, we warn and exit but priv->num_aspaces remains incremented. Don't incremement the count until we know that it fits in the array. Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org> Signed-off-by: Rob Clark <robdclark@gmail.com>
This commit is contained in:
parent
2002c9c332
commit
36849cc361
|
@ -55,14 +55,13 @@ int msm_register_address_space(struct drm_device *dev,
|
||||||
struct msm_gem_address_space *aspace)
|
struct msm_gem_address_space *aspace)
|
||||||
{
|
{
|
||||||
struct msm_drm_private *priv = dev->dev_private;
|
struct msm_drm_private *priv = dev->dev_private;
|
||||||
int idx = priv->num_aspaces++;
|
|
||||||
|
|
||||||
if (WARN_ON(idx >= ARRAY_SIZE(priv->aspace)))
|
if (WARN_ON(priv->num_aspaces >= ARRAY_SIZE(priv->aspace)))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
priv->aspace[idx] = aspace;
|
priv->aspace[priv->num_aspaces] = aspace;
|
||||||
|
|
||||||
return idx;
|
return priv->num_aspaces++;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING
|
#ifdef CONFIG_DRM_MSM_REGISTER_LOGGING
|
||||||
|
|
Loading…
Reference in a new issue