]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: dsa: use DEVICE_ATTR_RW to declare temp1_max
authorVivien Didelot <vivien.didelot@savoirfairelinux.com>
Fri, 17 Apr 2015 19:12:25 +0000 (15:12 -0400)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Apr 2015 19:58:37 +0000 (15:58 -0400)
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>
net/dsa/dsa.c

index 5eaadabe23a1dbf6c8dcaa8032fd739d5d7d04c8..079a224471e7e20641079e9f54f82743c0172165 100644 (file)
@@ -124,7 +124,7 @@ static ssize_t temp1_max_store(struct device *dev,
 
        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,
                                    struct device_attribute *attr, char *buf)
@@ -159,8 +159,8 @@ static umode_t dsa_hwmon_attrs_visible(struct kobject *kobj,
        if (index == 1) {
                if (!drv->get_temp_limit)
                        mode = 0;
-               else if (drv->set_temp_limit)
-                       mode |= S_IWUSR;
+               else if (!drv->set_temp_limit)
+                       mode &= ~S_IWUSR;
        } else if (index == 2 && !drv->get_temp_alarm) {
                mode = 0;
        }