Merge "msm: camera: req_mgr: validate input link handles" into dev/msm-4.9-camx (e88a3e6f) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/media/platform/msm/camera/cam_req_mgr/cam_req_mgr_core.c

+7 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2016-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -2487,6 +2487,12 @@ int cam_req_mgr_sync_config(
		return -EINVAL;
		}

		if ((!sync_info->link_hdls[0]) \|\| (!sync_info->link_hdls[1])) {
		CAM_WARN(CAM_CRM, "Invalid link handles 0x%x 0x%x",
		sync_info->link_hdls[0], sync_info->link_hdls[1]);
		return -EINVAL;
		}

		mutex_lock(&g_crm_core_dev->crm_lock);
		/* session hdl's priv data is cam session struct */
		cam_session = (struct cam_req_mgr_core_session *)