Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 648cd48c authored by Guenter Roeck's avatar Guenter Roeck
Browse files

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: default avatarJean Delvare <jdelvare@suse.de>
Reviewed-by: default avatarJean Delvare <jdelvare@suse.de>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 768821a3

drivers/hwmon/hwmon.c

+5 −0
Original line number Diff line number Diff line
@@ -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);