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

Commit da36805c authored by Lokesh Kumar Aakulu's avatar Lokesh Kumar Aakulu Committed by Gerrit - the friendly Code Review server
Browse files

msm: camera: Add check to ensure task wont hog CPU 



When user sent list is circular then kernel isp
driver will be in infinite while loop. To avoid
such scenario exit while loop when count reaches
a preset value of 100.

CRs-Fixed: 1064608
Change-Id: I0d2c8d05c60fcea37f3f1cc51c0b67a46702a913
Signed-off-by: default avatarLokesh Kumar Aakulu <lkumar@codeaurora.org>
parent 822fa236

drivers/media/platform/msm/camera_v2/isp/msm_isp_util_32.c

+15 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include "msm_camera_io_util.h"



#define MAX_ISP_V4l2_EVENTS 100

#define MAX_ISP_REG_LIST 100

static DEFINE_MUTEX(bandwidth_mgr_mutex);

static struct msm_isp_bandwidth_mgr isp_bandwidth_mgr;
@@ -543,6 +544,7 @@ int msm_isp_cfg_input(struct vfe_device *vfe_dev, void *arg) 
static int msm_isp_proc_cmd_list_unlocked(struct vfe_device *vfe_dev, void *arg)

{

	int rc = 0;

	uint32_t count = 0;

	struct msm_vfe_cfg_cmd_list *proc_cmd =

		(struct msm_vfe_cfg_cmd_list *)arg;

	struct msm_vfe_cfg_cmd_list cmd, cmd_next;
@@ -567,6 +569,12 @@ static int msm_isp_proc_cmd_list_unlocked(struct vfe_device *vfe_dev, void *arg) 
				sizeof(struct msm_vfe_cfg_cmd_list));

			break;

		}

		if (++count >= MAX_ISP_REG_LIST) {

			pr_err("%s:%d Error exceeding the max register count:%u\n",

				__func__, __LINE__, count);

			rc = -EFAULT;

			break;

		}

		if (copy_from_user(&cmd_next, (void __user *)cmd.next,

			sizeof(struct msm_vfe_cfg_cmd_list))) {

			rc = -EFAULT;
@@ -615,6 +623,7 @@ static void msm_isp_compat_to_proc_cmd(struct msm_vfe_cfg_cmd2 *proc_cmd, 
static int msm_isp_proc_cmd_list_compat(struct vfe_device *vfe_dev, void *arg)

{

	int rc = 0;

	uint32_t count = 0;

	struct msm_vfe_cfg_cmd_list_32 *proc_cmd =

		(struct msm_vfe_cfg_cmd_list_32 *)arg;

	struct msm_vfe_cfg_cmd_list_32 cmd, cmd_next;
@@ -639,6 +648,12 @@ static int msm_isp_proc_cmd_list_compat(struct vfe_device *vfe_dev, void *arg) 
				sizeof(struct msm_vfe_cfg_cmd_list));

			break;

		}

		if (++count >= MAX_ISP_REG_LIST) {

			pr_err("%s:%d Error exceeding the max register count:%u\n",

				__func__, __LINE__, count);

			rc = -EFAULT;

			break;

		}

		if (copy_from_user(&cmd_next, compat_ptr(cmd.next),

			sizeof(struct msm_vfe_cfg_cmd_list_32))) {

			rc = -EFAULT;