src/libsystemd/sd-device/sd-device.c

@@ -1812,7 +1812,7 @@ static int device_sysattrs_read_all_internal(sd_device *device, const char *subd
                 if (lstat(path, &statbuf) != 0)
                         continue;
 
-                if ((statbuf.st_mode & (S_IRUSR | S_IWUSR)) == 0)
+                if (!(statbuf.st_mode & S_IRUSR))
                         continue;
 
                 r = set_put_strdup(&device->sysattrs, p ?: dent->d_name);

src/udev/udevadm-info.c

@@ -73,7 +73,6 @@ static int print_all_attributes(sd_device *device, bool is_parent) {
         _cleanup_free_ SysAttr *sysattrs = NULL;
         const char *name, *value;
         size_t n_items = 0;
-        int r;
 
         value = NULL;
         (void) sd_device_get_devpath(device, &value);
@@ -97,22 +96,18 @@ static int print_all_attributes(sd_device *device, bool is_parent) {
                 if (skip_attribute(name))
                         continue;
 
-                r = sd_device_get_sysattr_value(device, name, &value);
+                if (sd_device_get_sysattr_value(device, name, &value) < 0)
-                if (r >= 0) {
+                        continue;
-                        /* skip any values that look like a path */
-                        if (value[0] == '/')
-                                continue;
 
-                        /* skip nonprintable attributes */
+                /* skip any values that look like a path */
-                        len = strlen(value);
+                if (value[0] == '/')
-                        while (len > 0 && isprint((unsigned char) value[len-1]))
+                        continue;
-                                len--;
-                        if (len > 0)
-                                continue;
 
-                } else if (r == -EPERM)
+                /* skip nonprintable attributes */
-                        value = "(write-only)";
+                len = strlen(value);
-                else
+                while (len > 0 && isprint((unsigned char) value[len-1]))
+                        len--;
+                if (len > 0)
                         continue;
 
                 if (!GREEDY_REALLOC(sysattrs, n_items + 1))