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

Commit 2e453053 authored by Venu Raidu's avatar Venu Raidu Committed by Gerrit - the friendly Code Review server
Browse files

msm: jpeg: Change io dump logic. 



Change io dump logic, to avoid invalid
pointer access.

Change-Id: If4261649f7c508169829e66f74ab15a04bc693e7
Signed-off-by: default avatarVenu Raidu <vraidu@codeaurora.org>
parent db9f2137

drivers/media/platform/msm/camera_v2/jpeg_10/msm_jpeg_hw.c

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

/* Copyright (c) 2012-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
@@ -907,7 +907,7 @@ int msm_jpeg_hw_exec_cmds(struct msm_jpeg_hw_cmd *hw_cmd_p, uint32_t m_cmds, 


void msm_jpeg_io_dump(void *base, int size)

{

	char line_str[128];

	char line_str[140];

	void __iomem *addr = (void __iomem *)base;

	int i;

	void __iomem *p = addr;
@@ -919,10 +919,10 @@ void msm_jpeg_io_dump(void *base, int size) 


	JPEG_DBG_HIGH("%s:%d] %pK %d", __func__, __LINE__, addr, size);

	line_str[0] = '\0';

	for (i = 0; i < size/4; i++) {

	for (i = 0; i < size; i = i+4) {

		if (i % 4 == 0) {

			used = snprintf(line_str + offset,

				sizeof_line_str - offset, "%pK ", p);

				sizeof_line_str - offset, "%pK", p+i);

			if ((used < min_range) ||

				(offset + used >= sizeof_line_str)) {

				JPEG_PR_ERR("%s\n", line_str);
@@ -932,9 +932,9 @@ void msm_jpeg_io_dump(void *base, int size) 
				offset += used;

			}

		}

		data = msm_camera_io_r(p++);

		data = msm_camera_io_r(p+i);

		used = snprintf(line_str + offset,

			sizeof_line_str - offset, "%08x ", data);

			sizeof_line_str - offset, " - %08x ", data);

		if ((used < min_range) ||

			(offset + used >= sizeof_line_str)) {

			JPEG_PR_ERR("%s\n", line_str);
@@ -943,11 +943,6 @@ void msm_jpeg_io_dump(void *base, int size) 
		} else {

			offset += used;

		}

		if ((i + 1) % 4 == 0) {

			JPEG_DBG_HIGH("%s\n", line_str);

			line_str[0] = '\0';

			offset = 0;

		}

	}

	if (line_str[0] != '\0')

		JPEG_DBG_HIGH("%s\n", line_str);