diff options
| author |   Guenter Roeck <linux@roeck-us.net> | 2014-02-28 10:37:55 -0800 |
|---|---|---|
| committer | Guenter Roeck <linux@roeck-us.net> | 2014-03-03 08:01:06 -0800 |
| commit | 648cd48c9e566f53c5df30d79857e0937ae13b09 (patch) | |
| tree | 1fd88b546e0018249a91befa414730de0a9a553b /drivers/hwmon | |
| parent | hwmon: (max6639) Use SIMPLE_DEV_PM_OPS macro (diff) | |
| download | linux-dev-648cd48c9e566f53c5df30d79857e0937ae13b09.tar.xz linux-dev-648cd48c9e566f53c5df30d79857e0937ae13b09.zip | |
hwmon: Do not accept invalid name attributes
hwmon name attributes must not include '-', as specified in
Documentation/hwmon/sysfs-interface. Also filter out spaces,
tabs, wildcards, and newline characters.
Tested-by: Jean Delvare <jdelvare@suse.de>
Reviewed-by: Jean Delvare <jdelvare@suse.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/hwmon.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/hwmon/hwmon.c b/drivers/hwmon/hwmon.c index e176a43af63d..a26c385a435b 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); |