diff options
| author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-11-12 14:58:25 +0900 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2019-11-19 11:07:31 +0100 |
| commit | b774282a855e951ceb921c8541598398d4f2b6cc (patch) | |
| tree | 6688d3987ccda34616eca4fbaf17e5998826c21e | |
| parent | 8d88a2ecd7ce12a2c8ef218bc12fa054e1c4b1c4 (diff) | |
| download | systemd-b774282a855e951ceb921c8541598398d4f2b6cc.tar.gz | |
udev: ignore error caused by device disconnection
During an add or change event, the device may be disconnected.
Fixes #13976.
(cherry picked from commit b64b83d13eedfdfc616c16c4a108ef28bf6d3b33)
| -rw-r--r-- | src/udev/udev-node.c | 23 |
1 files changed, 15 insertions, 8 deletions
diff --git a/src/udev/udev-node.c b/src/udev/udev-node.c index f161402f3a..ce95e20775 100644 --- a/src/udev/udev-node.c +++ b/src/udev/udev-node.c @@ -298,8 +298,11 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, else mode |= S_IFCHR; - if (lstat(devnode, &stats) < 0) + if (lstat(devnode, &stats) < 0) { + if (errno == ENOENT) + return 0; /* this is necessarily racey, so ignore missing the device */ return log_device_debug_errno(dev, errno, "cannot stat() node %s: %m", devnode); + } if ((mode != MODE_INVALID && (stats.st_mode & S_IFMT) != (mode & S_IFMT)) || stats.st_rdev != devnum) return log_device_debug_errno(dev, SYNTHETIC_ERRNO(EEXIST), @@ -324,11 +327,13 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, r = chmod_and_chown(devnode, mode, uid, gid); if (r < 0) - log_device_warning_errno(dev, r, "Failed to set owner/mode of %s to uid=" UID_FMT ", gid=" GID_FMT ", mode=%#o: %m", - devnode, - uid_is_valid(uid) ? uid : stats.st_uid, - gid_is_valid(gid) ? gid : stats.st_gid, - mode != MODE_INVALID ? mode & 0777 : stats.st_mode & 0777); + log_device_full(dev, r == -ENOENT ? LOG_DEBUG : LOG_ERR, r, + "Failed to set owner/mode of %s to uid=" UID_FMT + ", gid=" GID_FMT ", mode=%#o: %m", + devnode, + uid_is_valid(uid) ? uid : stats.st_uid, + gid_is_valid(gid) ? gid : stats.st_gid, + mode != MODE_INVALID ? mode & 0777 : stats.st_mode & 0777); } else log_device_debug(dev, "Preserve permissions of %s, uid=" UID_FMT ", gid=" GID_FMT ", mode=%#o", devnode, @@ -345,7 +350,8 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, q = mac_selinux_apply(devnode, label); if (q < 0) - log_device_error_errno(dev, q, "SECLABEL: failed to set SELinux label '%s': %m", label); + log_device_full(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, + "SECLABEL: failed to set SELinux label '%s': %m", label); else log_device_debug(dev, "SECLABEL: set SELinux label '%s'", label); @@ -354,7 +360,8 @@ static int node_permissions_apply(sd_device *dev, bool apply_mac, q = mac_smack_apply(devnode, SMACK_ATTR_ACCESS, label); if (q < 0) - log_device_error_errno(dev, q, "SECLABEL: failed to set SMACK label '%s': %m", label); + log_device_full(dev, q == -ENOENT ? LOG_DEBUG : LOG_ERR, q, + "SECLABEL: failed to set SMACK label '%s': %m", label); else log_device_debug(dev, "SECLABEL: set SMACK label '%s'", label); |