On Mon, Mar 03, 2014 at 08:49:11AM +0100, Jean Delvare wrote: > On Sun, 2 Mar 2014 12:15:19 -0800, Guenter Roeck wrote: > > hwmon name attributes must not include '-', as specified in > > Documentation/hwmon/sysfs-interface. Also filter out spaces, > > tabs, wildcards, and newline characters. > > > > Signed-off-by: Guenter Roeck <linux@xxxxxxxxxxxx> > > --- > > v2: In addition to '-', filter out zero length names as well as names > > containing '*', ' ', '\t', and '\n'. > > > > drivers/hwmon/hwmon.c | 5 +++++ > > 1 file changed, 5 insertions(+) > > > > diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c > > index e176a43..a26c385 100644 > > --- a/drivers/hwmon/hwmon.c > > +++ b/drivers/hwmon/hwmon.c > > @@ -22,6 +22,7 @@ > > #include <linux/gfp.h> > > #include <linux/spinlock.h> > > #include <linux/pci.h> > > +#include <linux/string.h> > > > > #define HWMON_ID_PREFIX "hwmon" > > #define HWMON_ID_FORMAT HWMON_ID_PREFIX "%d" > > @@ -99,6 +100,10 @@ hwmon_device_register_with_groups(struct device *dev, const char *name, > > struct hwmon_device *hwdev; > > int err, id; > > > > + /* Do not accept invalid characters in hwmon name attribute */ > > + if (name && (!strlen(name) || strpbrk(name, "-* \t\n"))) > > + return ERR_PTR(-EINVAL); > > + > > id = ida_simple_get(&hwmon_ida, 0, 0, GFP_KERNEL); > > if (id < 0) > > return ERR_PTR(id); > > Tested-by: Jean Delvare <jdelvare@xxxxxxx> > Reviewed-by: Jean Delvare <jdelvare@xxxxxxx> > Thanks! Guenter _______________________________________________ lm-sensors mailing list lm-sensors@xxxxxxxxxxxxxx http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
