From 673810b5b743d561ee04c7cd82f9eac33187008c Mon Sep 17 00:00:00 2001
From: Patrick Tjin <pattjin@google.com>
Date: Tue, 22 Mar 2016 09:02:59 -0700
Subject: [PATCH] Revert "Keep history after reset to 3e127ab"
This reverts commit 82c11f3fdcc060e8bb26358b7e186e83bc51f660, reversing
changes made to a0706256c0d8ec8d5a7c2be8e148e568bc4f799d.
Change-Id: I6edf677940161dc2348aed6d8b5ed6bece6eb2cb
Signed-off-by: Patrick Tjin <pattjin@google.com>
---
drivers/platform/msm/ipa/rmnet_ipa.c | 5 +++++
drivers/thermal/msm_thermal-dev.c | 10 ++++++++++
2 files changed, 15 insertions(+)
diff --git a/drivers/platform/msm/ipa/rmnet_ipa.c b/drivers/platform/msm/ipa/rmnet_ipa.c
index bedf69a63173..a149a9eb4f7b 100644
--- a/drivers/platform/msm/ipa/rmnet_ipa.c
+++ b/drivers/platform/msm/ipa/rmnet_ipa.c
@@ -1242,6 +1242,11 @@ static int ipa_wwan_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
rmnet_mux_val.mux_id);
return rc;
}
+ if (rmnet_index >= MAX_NUM_OF_MUX_CHANNEL) {
+ IPAWANERR("Exceed mux_channel limit(%d)\n",
+ rmnet_index);
+ return -EFAULT;
+ }
IPAWANDBG("ADD_MUX_CHANNEL(%d, name: %s)\n",
extend_ioctl_data.u.rmnet_mux_val.mux_id,
extend_ioctl_data.u.rmnet_mux_val.vchannel_name);
diff --git a/drivers/thermal/msm_thermal-dev.c b/drivers/thermal/msm_thermal-dev.c
index de38d969da4e..33fd59856c53 100644
--- a/drivers/thermal/msm_thermal-dev.c
+++ b/drivers/thermal/msm_thermal-dev.c
@@ -99,6 +99,16 @@ static long validate_and_copy(unsigned int *cmd, unsigned long *arg,
goto validate_exit;
}
break;
+ case MSM_THERMAL_GET_CLUSTER_FREQUENCY_PLAN:
+ if (query->clock_freq.cluster_num >= NR_CPUS) {
+ ret = -EINVAL;
+ goto validate_exit;
+ }
+ case MSM_THERMAL_GET_CLUSTER_VOLTAGE_PLAN:
+ if (query->voltage.cluster_num >= NR_CPUS) {
+ ret = -EINVAL;
+ goto validate_exit;
+ }
default:
break;
}
--
GitLab