dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-03 22:50:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

firstboot: Check for errors returned by dir_fd_is_root()

Browse Source
This commit is contained in:
Daan De Meyer
2023-03-29 17:59:50 +02:00
parent fe58566282
commit fe75d5bcfa
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/firstboot/firstboot.c
View File

@@ -344,7 +344,11 @@ static int process_locale(int rfd) {
if (r <= 0)
return r;
if (arg_copy_locale && !dir_fd_is_root(rfd)) {
r = dir_fd_is_root(rfd);
if (r < 0)
return log_error_errno(r, "Failed to check if directory file descriptor is root: %m");
if (arg_copy_locale && r == 0) {
r = copy_file_atomic_at(AT_FDCWD, "/etc/locale.conf", pfd, f, 0644, COPY_REFLINK);
if (r != -ENOENT) {
if (r < 0)
@@ -429,7 +433,11 @@ static int process_keymap(int rfd) {
if (r <= 0)
return r;
if (arg_copy_keymap && !dir_fd_is_root(rfd)) {
r = dir_fd_is_root(rfd);
if (r < 0)
return log_error_errno(r, "Failed to check if directory file descriptor is root: %m");
if (arg_copy_keymap && r == 0) {
r = copy_file_atomic_at(AT_FDCWD, "/etc/vconsole.conf", pfd, f, 0644, COPY_REFLINK);
if (r != -ENOENT) {
if (r < 0)
@@ -517,7 +525,11 @@ static int process_timezone(int rfd) {
if (r <= 0)
return r;
if (arg_copy_timezone && !dir_fd_is_root(rfd)) {
r = dir_fd_is_root(rfd);
if (r < 0)
return log_error_errno(r, "Failed to check if directory file descriptor is root: %m");
if (arg_copy_timezone && r == 0) {
_cleanup_free_ char *s = NULL;
r = readlink_malloc("/etc/localtime", &s);
@@ -973,7 +985,11 @@ static int process_root_account(int rfd) {
if (r < 0)
return log_error_errno(r, "Failed to take a lock on /etc/passwd: %m");
if (arg_copy_root_shell && !dir_fd_is_root(rfd)) {
k = dir_fd_is_root(rfd);
if (k < 0)
return log_error_errno(k, "Failed to check if directory file descriptor is root: %m");
if (arg_copy_root_shell && k == 0) {
struct passwd *p;
errno = 0;
@@ -990,7 +1006,7 @@ static int process_root_account(int rfd) {
if (r < 0)
return r;
if (arg_copy_root_password && !dir_fd_is_root(rfd)) {
if (arg_copy_root_password && k == 0) {
struct spwd *p;
errno = 0;