diff options
Diffstat (limited to 'src/shared/selinux-util.c')
| -rw-r--r-- | src/shared/selinux-util.c | 38 |
1 files changed, 11 insertions, 27 deletions
diff --git a/src/shared/selinux-util.c b/src/shared/selinux-util.c index 5745fe09a2..a1359a5bfd 100644 --- a/src/shared/selinux-util.c +++ b/src/shared/selinux-util.c @@ -497,25 +497,30 @@ static int selinux_create_file_prepare_abspath(const char *abspath, mode_t mode) } #endif -int mac_selinux_create_file_prepare_at(int dirfd, const char *path, mode_t mode) { +int mac_selinux_create_file_prepare_at( + int dir_fd, + const char *path, + mode_t mode) { + #if HAVE_SELINUX _cleanup_free_ char *abspath = NULL; int r; - assert(path); + if (dir_fd < 0 && dir_fd != AT_FDCWD) + return -EBADF; if (!label_hnd) return 0; - if (!path_is_absolute(path)) { - if (dirfd == AT_FDCWD) + if (isempty(path) || !path_is_absolute(path)) { + if (dir_fd == AT_FDCWD) r = safe_getcwd(&abspath); else - r = fd_get_path(dirfd, &abspath); + r = fd_get_path(dir_fd, &abspath); if (r < 0) return r; - if (!path_extend(&abspath, path)) + if (!isempty(path) && !path_extend(&abspath, path)) return -ENOMEM; path = abspath; @@ -527,27 +532,6 @@ int mac_selinux_create_file_prepare_at(int dirfd, const char *path, mode_t mode) #endif } -int mac_selinux_create_file_prepare(const char *path, mode_t mode) { -#if HAVE_SELINUX - int r; - - _cleanup_free_ char *abspath = NULL; - - assert(path); - - if (!label_hnd) - return 0; - - r = path_make_absolute_cwd(path, &abspath); - if (r < 0) - return r; - - return selinux_create_file_prepare_abspath(abspath, mode); -#else - return 0; -#endif -} - int mac_selinux_create_file_prepare_label(const char *path, const char *label) { #if HAVE_SELINUX |