Merge "msm-camera: Addressing possible overflow conditions"

This commit is contained in:
Linux Build Service Account 2016-12-31 02:17:46 -08:00 committed by Gerrit - the friendly Code Review server
commit 0d0e807793

View file

@ -394,6 +394,12 @@ int msm_camera_config_vreg(struct device *dev, struct camera_vreg_t *cam_vreg,
pr_err("%s:%d vreg sequence invalid\n", __func__, __LINE__); pr_err("%s:%d vreg sequence invalid\n", __func__, __LINE__);
return -EINVAL; return -EINVAL;
} }
if (cam_vreg == NULL) {
pr_err("%s:%d cam_vreg sequence invalid\n", __func__, __LINE__);
return -EINVAL;
}
if (!num_vreg_seq) if (!num_vreg_seq)
num_vreg_seq = num_vreg; num_vreg_seq = num_vreg;