From f4ea8432e67110b73b07dd0e47a5339d83b350fb Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Jul 2019 09:38:15 +0200
Subject: [PATCH 1/4] cryptsetup-generator: fix coverity issue

Fixes coverity issue 1403772
---
 src/cryptsetup/cryptsetup-generator.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index c51bb9ae18..960f4762b7 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -46,30 +46,30 @@ STATIC_DESTRUCTOR_REGISTER(arg_disks, hashmap_freep);
 STATIC_DESTRUCTOR_REGISTER(arg_default_options, freep);
 STATIC_DESTRUCTOR_REGISTER(arg_default_keyfile, freep);
 
-static int split_keyspec(const char *keyspec, char **keyfile, char **keydev) {
+static int split_keyspec(const char *keyspec, char **ret_keyfile, char **ret_keydev) {
         _cleanup_free_ char *kfile = NULL, *kdev = NULL;
-        char *c;
+        const char *c;
 
         assert(keyspec);
-        assert(keyfile);
-        assert(keydev);
+        assert(ret_keyfile);
+        assert(ret_keydev);
 
         c = strrchr(keyspec, ':');
         if (c) {
                 kfile = strndup(keyspec, c-keyspec);
                 kdev = strdup(c + 1);
-                if (!*kfile || !*kdev)
+                if (!kfile || !kdev)
                         return log_oom();
         } else {
                 /* No keydev specified */
                 kfile = strdup(keyspec);
                 kdev = NULL;
-                if (!*kfile)
+                if (!kfile)
                         return log_oom();
         }
 
-        *keyfile = TAKE_PTR(kfile);
-        *keydev = TAKE_PTR(kdev);
+        *ret_keyfile = TAKE_PTR(kfile);
+        *ret_keydev = TAKE_PTR(kdev);
 
         return 0;
 }

From 771f8aef574e3ca812345bd832f883961fdd05ca Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Jul 2019 09:39:12 +0200
Subject: [PATCH 2/4] unit-file: fix coverity issue

Fixes coverity issue 1403820
---
 src/shared/unit-file.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/shared/unit-file.c b/src/shared/unit-file.c
index 8a09f3827f..db73c9bd4b 100644
--- a/src/shared/unit-file.c
+++ b/src/shared/unit-file.c
@@ -462,7 +462,7 @@ int unit_file_find_fragment(
 
                 r = unit_ids_map_get(unit_ids_map, template, &fragment);
                 if (r < 0 && !IN_SET(r, -ENOENT, -ENXIO))
-                        return log_debug_errno(r, "Cannot load template %s: %m", *t);
+                        return log_debug_errno(r, "Cannot load template %s: %m", template);
 
                 if (fragment) {
                         /* Add any aliases of the original name to the set of names */

From 38c569bbb810dcbdf746c96ba6077acb56ca65bd Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Jul 2019 09:42:24 +0200
Subject: [PATCH 3/4] test-chase-symlinks: fix coverity issue

Fixes coverity issue 1403708
---
 src/test/test-chase-symlinks.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/test-chase-symlinks.c b/src/test/test-chase-symlinks.c
index 3fac6b6bc5..013b36e2a7 100644
--- a/src/test/test-chase-symlinks.c
+++ b/src/test/test-chase-symlinks.c
@@ -1,8 +1,9 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 #include <getopt.h>
 
-#include "log.h"
+#include "fd-util.h"
 #include "fs-util.h"
+#include "log.h"
 #include "main-func.h"
 
 static char *arg_root = NULL;
@@ -97,6 +98,9 @@ static int run(int argc, char **argv) {
                         log_error_errno(r, "failed: %m");
                 else
                         log_info("→ %s", p);
+
+                if (FLAGS_SET(arg_flags, CHASE_OPEN))
+                        safe_close(r);
         }
 
         return 0;

From 735a8b6d38a7116975a4650b0967ad71a4757559 Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 31 Jul 2019 09:44:28 +0200
Subject: [PATCH 4/4] job: fix coverity issue

Fixes coverity issue 1403550
---
 src/core/job.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/job.c b/src/core/job.c
index cda4f344b8..9537366eb9 100644
--- a/src/core/job.c
+++ b/src/core/job.c
@@ -1153,8 +1153,11 @@ void job_add_to_run_queue(Job *j) {
                         log_warning_errno(r, "Failed to enable job run queue event source, ignoring: %m");
         }
 
-        prioq_put(j->manager->run_queue, j, &j->run_queue_idx);
-        j->in_run_queue = true;
+        r = prioq_put(j->manager->run_queue, j, &j->run_queue_idx);
+        if (r < 0)
+                log_warning_errno(r, "Failed put job in run queue, ignoring: %m");
+        else
+                j->in_run_queue = true;
 }
 
 void job_add_to_dbus_queue(Job *j) {