Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 47ab5d0d authored by Venu Yeshala's avatar Venu Yeshala Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: ispif: Validate VFE num input during reset 



Userspace supplies the actual number of used VFEs in session to ISPIF.
Validate the userspace input value and if found to be invalid, return
error.

CRs-Fixed: 898074
Change-Id: I3288ddb6404e817a705a92281b4c54666f372c56
Signed-off-by: default avatarVenu Yeshala <vyeshala@codeaurora.org>
parent e3ea6c56

drivers/media/platform/msm/camera_v2/ispif/msm_ispif.c

+8 −2
Original line number Diff line number Diff line
@@ -1295,9 +1295,15 @@ static irqreturn_t msm_io_ispif_irq(int irq_num, void *data) 
static int msm_ispif_set_vfe_info(struct ispif_device *ispif,

	struct msm_ispif_vfe_info *vfe_info)

{

	memcpy(&ispif->vfe_info, vfe_info, sizeof(struct msm_ispif_vfe_info));

	if (ispif->vfe_info.num_vfe > ispif->hw_num_isps)

	if (!vfe_info || (vfe_info->num_vfe == 0) ||

		(vfe_info->num_vfe > ispif->hw_num_isps)) {

		pr_err("Invalid VFE info: %p %d\n", vfe_info,

			   (vfe_info ? vfe_info->num_vfe : 0));

		return -EINVAL;

	}



	memcpy(&ispif->vfe_info, vfe_info, sizeof(struct msm_ispif_vfe_info));



	return 0;

}