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

Commit 15a9fcb5 authored by Jeyaprakash Soundrapandian's avatar Jeyaprakash Soundrapandian Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: Allow cmd buffer size to be equal to length" into dev/msm-4.14-camx

parents 47bc95ca f69ec019

drivers/media/platform/msm/camera/cam_cdm/cam_cdm_virtual_core.c

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

/* Copyright (c) 2017-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
@@ -120,7 +120,7 @@ int cam_virtual_cdm_submit_bl(struct cam_hw_info *cdm_hw, 
			(len >= cdm_cmd->cmd[i].offset)) {





			if ((len - cdm_cmd->cmd[i].offset) <=

			if ((len - cdm_cmd->cmd[i].offset) <

				cdm_cmd->cmd[i].len) {

				CAM_ERR(CAM_CDM, "Not enough buffer");

				rc = -EINVAL;

drivers/media/platform/msm/camera/cam_utils/cam_packet_util.c

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

/* Copyright (c) 2017-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
@@ -131,7 +131,7 @@ int cam_packet_util_get_kmd_buffer(struct cam_packet *packet, 


	remain_len = len;

	if (((size_t)cmd_desc->offset >= len) ||

		((size_t)cmd_desc->size >= (len - (size_t)cmd_desc->offset))) {

		((size_t)cmd_desc->size > (len - (size_t)cmd_desc->offset))) {

		CAM_ERR(CAM_UTIL, "invalid memory len:%zd and cmd desc size:%d",

			len, cmd_desc->size);

		rc = -EINVAL;