Skip to contentSkip to conversation

thermal: cut the spaces when user sets policy

PATCH Superseded Andy Shevchenko 2 participants 2 messages May 7, 2013 – May 8, 2013 Thermal

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 thermal: cut the spaces when user sets policy

Setting policy results in invalid value error.
% echo "step_wise" > policy
% echo: write error: Invalid argument

Need clean up of the buffer which "echo" may add based on the arguments, before comparing aganist list of governor names.

---
In v2:
- copy input string to a temporary buffer

 drivers/thermal/thermal_core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/thermal/thermal_core.c +5 -1
index d755440..e256380 100644
@@ -33,6 +33,7 @@
 #include <linux/idr.h>
 #include <linux/thermal.h>
 #include <linux/reboot.h>
+#include <linux/string.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 
@@ -713,10 +714,13 @@ policy_store(struct device *dev, struct device_attribute *attr,
 	int ret = -EINVAL;
 	struct thermal_zone_device *tz = to_thermal_zone(dev);
 	struct thermal_governor *gov;
+	char *name[THERMAL_NAME_LENGTH];
+
+	snprintf(name, sizeof(name), "%s", buf);
 
 	mutex_lock(&thermal_governor_lock);
 
-	gov = __find_governor(buf);
+	gov = __find_governor(strim(name));
 	if (!gov)
 		goto exit;
 
Signature · 1 line
1.8.2.rc0.22.gb3600c3
#1 lore raw

Andy,

Quoted 9 lines · Andy Shevchenko

Setting policy results in invalid value error.
% echo "step_wise" > policy
% echo: write error: Invalid argument

Need clean up of the buffer which "echo" may add based on the arguments, before comparing aganist list of governor names.

This one was close..

Quoted 19 lines

---
In v2:
- copy input string to a temporary buffer

 drivers/thermal/thermal_core.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
drivers/thermal/thermal_core.c +1 -0
index d755440..e256380 100644
@@ -33,6 +33,7 @@
 #include <linux/idr.h>
 #include <linux/thermal.h>
 #include <linux/reboot.h>
+#include <linux/string.h>
 #include <net/netlink.h>
 #include <net/genetlink.h>
 

drivers/thermal/thermal_core.c policy_store(struct device *dev, struct device_attribute *attr, · line 717

Quoted 4 lines
drivers/thermal/thermal_core.c +1 -0
@@ -713,10 +714,13 @@ policy_store(struct device *dev, struct device_attribute *attr,
 	int ret = -EINVAL;
 	struct thermal_zone_device *tz = to_thermal_zone(dev);
 	struct thermal_governor *gov;
+	char *name[THERMAL_NAME_LENGTH];

I really believe you meant:
+ char name[THERMAL_NAME_LENGTH];

drivers/thermal/thermal_core.c policy_store(struct device *dev, struct device_attribute *attr, · line 720

Quoted 3 lines
drivers/thermal/thermal_core.c +2 -0
+
+	snprintf(name, sizeof(name), "%s", buf);
 

Still there are compilation warnings.

Quoted 8 lines
drivers/thermal/thermal_core.c +1 -1
 	mutex_lock(&thermal_governor_lock);
 
-	gov = __find_governor(buf);
+	gov = __find_governor(strim(name));
 	if (!gov)
 		goto exit;