diff --git a/drivers/media/platform/msm/cvp/msm_cvp.c b/drivers/media/platform/msm/cvp/msm_cvp.c
index 239ceb89acfa..346f21641519 100644
--- a/drivers/media/platform/msm/cvp/msm_cvp.c
+++ b/drivers/media/platform/msm/cvp/msm_cvp.c
@@ -741,6 +741,13 @@ static int msm_cvp_session_process_hfi_fence(struct msm_cvp_inst *inst,
 		f->output_index = kfc->output_index;
 	}
 
+	if (f->num_fences >= (MAX_HFI_FENCE_SIZE / 2)) {
+		dprintk(CVP_ERR, "%s: Max number of fences exceeded! Max number supported: %d",
+				__func__, (MAX_HFI_FENCE_SIZE / 2));
+		cvp_free_fence_data(f);
+		msm_cvp_unmap_frame(inst, pkt->client_data.kdata);
+		goto exit;
+	}
 
 	dprintk(CVP_SYNX, "%s: frameID %llu ktid %llu\n",
 			__func__, f->frame_id, pkt->client_data.kdata);