diff options
author | Vivien Didelot <vivien.didelot@savoirfairelinux.com> | 2015-04-17 15:12:25 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2015-04-17 15:58:37 -0400 |
commit | e3122b7fae7b4e3d1d49fa84f6515bcbe6cbc6fc (patch) | |
tree | 4da80804e57296d9cbe7a48f22d6734b557c9c64 /net | |
parent | 2591ffd3085e34a231480efe8f1cac83ebb81725 (diff) |
net: dsa: use DEVICE_ATTR_RW to declare temp1_max
Since commit da4759c (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: Vivien Didelot <vivien.didelot@savoirfairelinux.com>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
-rw-r--r-- | net/dsa/dsa.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/dsa/dsa.c b/net/dsa/dsa.c index 5eaadabe23a1..079a224471e7 100644 --- a/net/dsa/dsa.c +++ b/net/dsa/dsa.c | |||
@@ -124,7 +124,7 @@ static ssize_t temp1_max_store(struct device *dev, | |||
124 | 124 | ||
125 | return count; | 125 | return count; |
126 | } | 126 | } |
127 | static DEVICE_ATTR(temp1_max, S_IRUGO, temp1_max_show, temp1_max_store); | 127 | static DEVICE_ATTR_RW(temp1_max); |
128 | 128 | ||
129 | static ssize_t temp1_max_alarm_show(struct device *dev, | 129 | static ssize_t temp1_max_alarm_show(struct device *dev, |
130 | struct device_attribute *attr, char *buf) | 130 | struct device_attribute *attr, char *buf) |
@@ -159,8 +159,8 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj, | |||
159 | if (index == 1) { | 159 | if (index == 1) { |
160 | if (!drv->get_temp_limit) | 160 | if (!drv->get_temp_limit) |
161 | mode = 0; | 161 | mode = 0; |
162 | else if (drv->set_temp_limit) | 162 | else if (!drv->set_temp_limit) |
163 | mode |= S_IWUSR; | 163 | mode &= ~S_IWUSR; |
164 | } else if (index == 2 && !drv->get_temp_alarm) { | 164 | } else if (index == 2 && !drv->get_temp_alarm) { |
165 | mode = 0; | 165 | mode = 0; |
166 | } | 166 | } |