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

Commit 34b49474 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

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

parents e3e9668f 47ab5d0d

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;

}