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

Commit 22c15f22 authored by Camera Software Integration's avatar Camera Software Integration Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: common: Fix integer overflow in shift" into camera-kernel.lnx.1.0

parents 62977f24 30b9eed0

drivers/cam_icp/icp_hw/icp_hw_mgr/cam_icp_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -4491,7 +4491,7 @@ static void cam_icp_mgr_print_io_bufs(struct cam_packet *packet, 
					"get src buf address fail rc %d", rc);

				continue;

			}

			if (iova_addr >> 32) {

			if ((iova_addr & 0xFFFFFFFF) != iova_addr) {

				CAM_ERR(CAM_ICP, "Invalid mapped address");

				rc = -EINVAL;

				continue;

drivers/cam_isp/isp_hw_mgr/cam_ife_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -5741,7 +5741,7 @@ static void cam_ife_mgr_print_io_bufs(struct cam_packet *packet, 
					io_cfg[i].mem_handle[j]);

				continue;

			}

			if (iova_addr >> 32) {

			if ((iova_addr & 0xFFFFFFFF) != iova_addr) {

				CAM_ERR(CAM_ISP, "Invalid mapped address");

				rc = -EINVAL;

				continue;

drivers/cam_jpeg/jpeg_hw/cam_jpeg_hw_mgr.c

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ static void cam_jpeg_mgr_print_io_bufs(struct cam_packet *packet, 
				CAM_ERR(CAM_UTIL, "get src buf address fail");

				continue;

			}

			if (iova_addr >> 32) {

			if ((iova_addr & 0xFFFFFFFF) != iova_addr) {

				CAM_ERR(CAM_JPEG, "Invalid mapped address");

				rc = -EINVAL;

				continue;