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

Commit f69ec019 authored by Mukund Madhusudan Atre's avatar Mukund Madhusudan Atre
Browse files

msm: camera: Allow cmd buffer size to be equal to length 



Sum of cmd buffer offset and its size can be equal to allocated
length by the kernel. Earlier, passing cmd buffer size equal to
kmd length was causing unit test to fail.

Change-Id: I7bca5a3a97321e403e6aa39fff2fe65b4cc624c3
Signed-off-by: default avatarMukund Madhusudan Atre <matre@codeaurora.org>
parent dd89b26d

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;