diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-02-18 23:22:27 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-02-21 04:40:17 +0900 |
commit | acfc2a1d15560084e077ffb3be472cd117e9020a (patch) | |
tree | 2c1a1cff54d69cfa19eb6cebd3e7cde0f1ac0c55 /src/libsystemd | |
parent | 32a739afe0c14fab00cfe45dfe87e60d59c74ce0 (diff) | |
download | systemd-acfc2a1d15560084e077ffb3be472cd117e9020a.tar.gz |
sd-device: ignore error in device_cache_sysattr_value() and propagate original error code
There are three calls of device_cache_sysattr_value(). Two of them are
just caching the value. Hence, let's ignore its failure, and propagate
original error code.
One exception is the last call in sd_device_get_sysattr_value().
Unfortunately, it returns `const char *` instead of `char *`. So,
sd_device object must have the reference of the returned value.
Hence, error in updating the cache by device_cache_sysattr_value()
is critical, and we need to propagate the error in that case.
Diffstat (limited to 'src/libsystemd')
-rw-r--r-- | src/libsystemd/sd-device/sd-device.c | 32 | ||||
-rw-r--r-- | src/libsystemd/sd-device/test-sd-device.c | 3 |
2 files changed, 24 insertions, 11 deletions
diff --git a/src/libsystemd/sd-device/sd-device.c b/src/libsystemd/sd-device/sd-device.c index 991779aa9c..dad87f39c9 100644 --- a/src/libsystemd/sd-device/sd-device.c +++ b/src/libsystemd/sd-device/sd-device.c @@ -1894,12 +1894,16 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, path = prefix_roota(syspath, sysattr); r = lstat(path, &statbuf); if (r < 0) { + int k; + /* remember that we could not access the sysattr */ - r = device_cache_sysattr_value(device, sysattr, NULL); - if (r < 0) - return r; + k = device_cache_sysattr_value(device, sysattr, NULL); + if (k < 0) + log_device_debug_errno(device, k, + "sd-device: failed to cache attribute '%s' with NULL, ignoring: %m", + sysattr); - return -ENOENT; + return r; } else if (S_ISLNK(statbuf.st_mode)) { /* Some core links return only the last element of the target path, * these are just values, the paths should not be exposed. */ @@ -1925,11 +1929,16 @@ _public_ int sd_device_get_sysattr_value(sd_device *device, const char *sysattr, delete_trailing_chars(value, "\n"); } + /* Unfortunately, we need to return 'const char*' instead of 'char*'. Hence, failure in caching + * sysattr value is critical unlike the other places. */ r = device_cache_sysattr_value(device, sysattr, value); - if (r < 0) - return r; - - if (ret_value) + if (r < 0) { + log_device_debug_errno(device, r, + "sd-device: failed to cache attribute '%s' with '%s'%s: %m", + sysattr, value, ret_value ? "" : ", ignoring"); + if (ret_value) + return r; + } else if (ret_value) *ret_value = TAKE_PTR(value); return 0; @@ -1990,8 +1999,11 @@ _public_ int sd_device_set_sysattr_value(sd_device *device, const char *sysattr, r = device_cache_sysattr_value(device, sysattr, value); if (r < 0) - return r; - TAKE_PTR(value); + log_device_debug_errno(device, r, + "sd-device: failed to cache attribute '%s' with '%s', ignoring: %m", + sysattr, value); + else + TAKE_PTR(value); return 0; } diff --git a/src/libsystemd/sd-device/test-sd-device.c b/src/libsystemd/sd-device/test-sd-device.c index fd30d1a1d0..aaa16f740d 100644 --- a/src/libsystemd/sd-device/test-sd-device.c +++ b/src/libsystemd/sd-device/test-sd-device.c @@ -4,6 +4,7 @@ #include "device-internal.h" #include "device-private.h" #include "device-util.h" +#include "errno-util.h" #include "hashmap.h" #include "nulstr-util.h" #include "string-util.h" @@ -51,7 +52,7 @@ static void test_sd_device_one(sd_device *d) { } r = sd_device_get_sysattr_value(d, "name_assign_type", &val); - assert_se(r >= 0 || IN_SET(r, -ENOENT, -EINVAL)); + assert_se(r >= 0 || ERRNO_IS_PRIVILEGE(r) || IN_SET(r, -ENOENT, -EINVAL)); r = sd_device_get_property_value(d, "ID_NET_DRIVER", &val); assert_se(r >= 0 || r == -ENOENT); |