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

Commit ae789b7a authored by Ashish Garg's avatar Ashish Garg
Browse files

msm: mdss: validate page id before reading from edid buffer 



Provide complete resolution details in a sysfs node "res_info"
limited to PAGE_SIZE. Different modules can query for multiple
resolution details based on the resolution ids received from
EDID of the TV. In case resolution details exceed PAGE_SIZE,
reuse res_info to get remaining timing details by provide page
details. Check page id is within the max supported resolution
ids to avoid reading extra memory than required.

Change-Id: I7cdd071ba462080fe5bb302d0da824ed95b50f15
Signed-off-by: default avatarAshish Garg <ashigarg@codeaurora.org>
parent 43cc5f8b

drivers/video/msm/mdss/mdss_hdmi_edid.c

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

/* Copyright (c) 2010-2017, 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
@@ -460,8 +460,10 @@ static ssize_t hdmi_edid_sysfs_wta_res_info(struct device *dev, 
	struct device_attribute *attr, const char *buf, size_t count)

{

	int rc, page_id;

	u32 i = 0, j, page;

	ssize_t ret = strnlen(buf, PAGE_SIZE);

	struct hdmi_edid_ctrl *edid_ctrl = hdmi_edid_get_ctrl(dev);

	struct msm_hdmi_mode_timing_info info = {0};



	if (!edid_ctrl) {

		DEV_ERR("%s: invalid input\n", __func__);
@@ -474,7 +476,22 @@ static ssize_t hdmi_edid_sysfs_wta_res_info(struct device *dev, 
		return rc;

	}



	if (page_id > MSM_HDMI_INIT_RES_PAGE) {

		page = MSM_HDMI_INIT_RES_PAGE;

		while (page < page_id) {

			j = 1;

			while (sizeof(info) * j < PAGE_SIZE) {

				i++;

				j++;

			}

			page++;

		}

	}



	if (i < HDMI_VFRMT_MAX)

		edid_ctrl->page_id = page_id;

	else

		DEV_ERR("%s: invalid page id\n", __func__);



	DEV_DBG("%s: %d\n", __func__, edid_ctrl->page_id);

	return ret;