Merge "msm: ais: sensor: Fix out of bound read for region params" (b6dc6868) · Commits · e / devices / android_kernel_xiaomi_markw

drivers/media/platform/msm/ais/sensor/actuator/msm_actuator.c

+5 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-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
		@@ -646,6 +646,8 @@ static int32_t msm_actuator_move_focus(
		a_ctrl->curr_step_pos, dest_step_pos, curr_lens_pos);

		while (a_ctrl->curr_step_pos != dest_step_pos) {
		if (a_ctrl->curr_region_index >= a_ctrl->region_size)
		break;
		step_boundary =
		a_ctrl->region_params[a_ctrl->curr_region_index].
		step_bound[dir];
		@@ -766,6 +768,8 @@ static int32_t msm_actuator_bivcm_move_focus(
		a_ctrl->curr_step_pos, dest_step_pos, curr_lens_pos);

		while (a_ctrl->curr_step_pos != dest_step_pos) {
		if (a_ctrl->curr_region_index >= a_ctrl->region_size)
		break;
		step_boundary =
		a_ctrl->region_params[a_ctrl->curr_region_index].
		step_bound[dir];