diff options
| author |   Luca Boccassi <luca.boccassi@microsoft.com> | 2021-08-03 21:14:31 +0100 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-08-03 21:14:31 +0100 |
| commit | 1c32b7699621d90d8926bffbe497acef549047e5 (patch) | |
| tree | dab8264989e86eca53970a40accf6d2741e48904 | |
| parent | Merge pull request #20346 from poettering/strlen-unsigned-fix (diff) | |
| parent | tree-wide: voidify unchecked close_nointr calls (diff) | |
| download | systemd-1c32b7699621d90d8926bffbe497acef549047e5.tar.xz systemd-1c32b7699621d90d8926bffbe497acef549047e5.zip | |
Merge pull request #20371 from bluca/coverity
Two small coverity fixes
| -rw-r--r-- | src/libsystemd/sd-login/sd-login.c | 2 | ||||
| -rw-r--r-- | src/libsystemd/sd-network/sd-network.c | 2 | ||||
| -rw-r--r-- | src/login/logind-session-device.c | 2 | ||||
| -rw-r--r-- | src/shared/creds-util.c | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/src/libsystemd/sd-login/sd-login.c b/src/libsystemd/sd-login/sd-login.c index 3adf1cef5cf..d127443c4c0 100644 --- a/src/libsystemd/sd-login/sd-login.c +++ b/src/libsystemd/sd-login/sd-login.c @@ -999,7 +999,7 @@ _public_ int sd_login_monitor_new(const char *category, sd_login_monitor **m) { _public_ sd_login_monitor* sd_login_monitor_unref(sd_login_monitor *m) { if (m) - close_nointr(MONITOR_TO_FD(m)); + (void) close_nointr(MONITOR_TO_FD(m)); return NULL; } diff --git a/src/libsystemd/sd-network/sd-network.c b/src/libsystemd/sd-network/sd-network.c index 7273a77156a..ee93dae9e3a 100644 --- a/src/libsystemd/sd-network/sd-network.c +++ b/src/libsystemd/sd-network/sd-network.c @@ -444,7 +444,7 @@ _public_ int sd_network_monitor_new(sd_network_monitor **m, const char *category _public_ sd_network_monitor* sd_network_monitor_unref(sd_network_monitor *m) { if (m) - close_nointr(MONITOR_TO_FD(m)); + (void) close_nointr(MONITOR_TO_FD(m)); return NULL; } diff --git a/src/login/logind-session-device.c b/src/login/logind-session-device.c index f2adb969d4e..1c4d543889e 100644 --- a/src/login/logind-session-device.c +++ b/src/login/logind-session-device.c @@ -141,7 +141,7 @@ static int session_device_open(SessionDevice *sd, bool active) { * that so fail at all times and let caller retry in inactive state. */ r = sd_drmsetmaster(fd); if (r < 0) { - close_nointr(fd); + (void) close_nointr(fd); return r; } } else diff --git a/src/shared/creds-util.c b/src/shared/creds-util.c index ee279e0c9c1..3bc5fbef512 100644 --- a/src/shared/creds-util.c +++ b/src/shared/creds-util.c @@ -299,6 +299,8 @@ int get_credential_host_secret(CredentialSecretFlags flags, void **ret, size_t * if (ret) { void *copy; + assert(sz <= sizeof(f->data)); /* Ensure we don't read past f->data bounds */ + copy = memdup(f->data, sz); if (!copy) return -ENOMEM; |