morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #25979 from yuwata/coverity-fixes

Browse Source 
Coverity fixes
This commit is contained in:
Lennart Poettering
2023-01-09 09:56:04 +01:00
committed by GitHub
parent d84bdadb43 3d5af17045
commit a3310012e8
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/boot/bootctl-random-seed.c
View File

@@ -39,7 +39,7 @@ static int set_system_token(void) {
r = getenv_bool("SYSTEMD_WRITE_SYSTEM_TOKEN");
if (r < 0) {
if (r != -ENXIO)
log_warning_errno(r, "Failed to parse $SYSTEMD_WRITE_SYSTEM_TOKEN, ignoring.");
log_warning_errno(r, "Failed to parse $SYSTEMD_WRITE_SYSTEM_TOKEN, ignoring.");
} else if (r == 0) {
log_notice("Not writing system token, because $SYSTEMD_WRITE_SYSTEM_TOKEN is set to false.");
return 0;
@@ -169,8 +169,8 @@ int install_random_seed(const char *esp) {
return set_system_token();
fail:
if (tmp)
(void) unlinkat(loader_dir_fd, tmp, 0);
assert(tmp);
(void) unlinkat(loader_dir_fd, tmp, 0);
return r;
}

17
src/tmpfiles/offline-passwd.c
View File

@@ -9,27 +9,28 @@
DEFINE_PRIVATE_HASH_OPS_WITH_KEY_DESTRUCTOR(uid_gid_hash_ops, char, string_hash_func, string_compare_func, free);
static int open_passwd_file(const char *root, const char *fname, FILE **ret_file) {
_cleanup_free_ char *p = NULL, *bn = NULL;
_cleanup_free_ char *p = NULL;
_cleanup_close_ int fd = -EBADF;
int r;
_cleanup_fclose_ FILE *f = NULL;
fd = chase_symlinks_and_open(fname, root, CHASE_PREFIX_ROOT, O_RDONLY|O_CLOEXEC, &p);
if (fd < 0)
return fd;
FILE *f = fdopen(fd, "r");
f = fdopen(fd, "r");
if (!f)
return -errno;
TAKE_FD(fd);
r = path_extract_filename(fname, &bn);
if (r < 0)
return r;
if (DEBUG_LOGGING) {
_cleanup_free_ char *bn = NULL;
log_debug("Reading %s entries from %s...", bn, p);
(void) path_extract_filename(fname, &bn);
log_debug("Reading %s entries from %s...", strna(bn), p);
}
*ret_file = f;
*ret_file = TAKE_PTR(f);
return 0;
}