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

Commit a479b876 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "camera_v2: JPEG 1.0: add alignment check on register offset"

parents c5880505 b722769c

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

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

/* Copyright (c) 2012-2013, 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
@@ -337,6 +337,11 @@ int msm_jpeg_hw_exec_cmds(struct msm_jpeg_hw_cmd *hw_cmd_p, uint32_t m_cmds, 
				__LINE__, hw_cmd_p->offset, max_size);

			return -EFAULT;

		}

		if (hw_cmd_p->offset & 0x3) {

			JPEG_PR_ERR("%s:%d] %d Invalid alignment\n", __func__,

					__LINE__, hw_cmd_p->offset);

			return -EFAULT;

		}



		switch (hw_cmd_p->type) {

		case MSM_JPEG_HW_CMD_TYPE_READ:

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

+2 −0
Original line number Diff line number Diff line
@@ -669,6 +669,8 @@ int msm_jpeg_ioctl_hw_cmd(struct msm_jpeg_device *pgmn_dev, 
			JPEG_PR_ERR("%s:%d] failed\n", __func__, __LINE__);

			return -EFAULT;

		}

	} else {

		return is_copy_to_user;

	}



	return 0;