Piteball
/
android_kernel_samsung_msm8976
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git
1
1
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Linux Build Service Account 2017-06-30 10:14:36 -07:00 committed by Gerrit - the friendly Code Review server
parent 8f1d157451 b64d3a8f6e
commit e226864580
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/video/msm/mdss/mdss_hdmi_edid.c
View File

@ -1,4 +1,4 @@
/* 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
@ -310,8 +310,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__);
@ -324,7 +326,22 @@ static ssize_t hdmi_edid_sysfs_wta_res_info(struct device *dev,
return rc;
}
edid_ctrl->page_id = page_id;
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;