summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@quicinc.com>2017-09-13 10:58:18 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-09-13 10:58:18 -0700
commit98fa67f2301e709684715157b1bd030fdcd3409c (patch)
tree06c2b4004aacca7897e52e159af213bc3974bc50
parent13ef16e98a2cab280225d8ff1466d637d1228eb4 (diff)
parent27d4a476f6aa84db74fcc5b65d87210d96b019cd (diff)
Merge "msm: mdss: hdmi: correctly validate the cec msg frame size"
-rw-r--r--drivers/video/fbdev/msm/mdss_cec_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/fbdev/msm/mdss_cec_core.c b/drivers/video/fbdev/msm/mdss_cec_core.c
index 4b53b01be709..1d9950494d65 100644
--- a/drivers/video/fbdev/msm/mdss_cec_core.c
+++ b/drivers/video/fbdev/msm/mdss_cec_core.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2015-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
@@ -681,7 +681,7 @@ static ssize_t cec_wta_msg(struct device *dev,
}
spin_unlock_irqrestore(&ctl->lock, flags);
- if (msg->frame_size > MAX_OPERAND_SIZE) {
+ if (msg->frame_size > MAX_CEC_FRAME_SIZE) {
pr_err("msg frame too big!\n");
ret = -EINVAL;
goto end;