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

Commit 85671676 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: Fix OOB issue in IR CUT driver"

parents 62833851 80282516

drivers/media/platform/msm/camera_v2/sensor/ir_cut/msm_ir_cut.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2016, 2019, 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
@@ -499,7 +499,6 @@ static long msm_ir_cut_subdev_do_ioctl( 
	struct msm_ir_cut_cfg_data_t ir_cut_data;



	CDBG("Enter");

	ir_cut_data.cfg_type = u32->cfg_type;



	switch (cmd) {

	case VIDIOC_MSM_IR_CUT_CFG32:
@@ -509,6 +508,7 @@ static long msm_ir_cut_subdev_do_ioctl( 
		return msm_ir_cut_subdev_ioctl(sd, cmd, arg);

	}



	ir_cut_data.cfg_type = u32->cfg_type;

	rc = msm_ir_cut_subdev_ioctl(sd, cmd, &ir_cut_data);



	CDBG("Exit");