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

Commit e3122b7f authored by Vivien Didelot's avatar Vivien Didelot Committed by David S. Miller
Browse files

net: dsa: use DEVICE_ATTR_RW to declare temp1_max 



Since commit da4759c7 (sysfs: Use only return value from is_visible for
the file mode), it is possible to reduce the permissions of a file.

So declare temp1_max with the DEVICE_ATTR_RW macro and remove the write
permission in dsa_hwmon_attrs_visible if set_temp_limit isn't provided.

Signed-off-by: default avatarVivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2591ffd3

net/dsa/dsa.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ static ssize_t temp1_max_store(struct device *dev, 




	return count;

	return count;

}

}

static DEVICE_ATTR(temp1_max, S_IRUGO, temp1_max_show, temp1_max_store);

static DEVICE_ATTR_RW(temp1_max);





static ssize_t temp1_max_alarm_show(struct device *dev,

static ssize_t temp1_max_alarm_show(struct device *dev,

				    struct device_attribute *attr, char *buf)

				    struct device_attribute *attr, char *buf)
@@ -159,8 +159,8 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj, 
	if (index == 1) {

	if (index == 1) {

		if (!drv->get_temp_limit)

		if (!drv->get_temp_limit)

			mode = 0;

			mode = 0;

		else if (drv->set_temp_limit)

		else if (!drv->set_temp_limit)

			mode |= S_IWUSR;

			mode &= ~S_IWUSR;

	} else if (index == 2 && !drv->get_temp_alarm) {

	} else if (index == 2 && !drv->get_temp_alarm) {

		mode = 0;

		mode = 0;

	}

	}