shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

Merge pull request #15251 from keszybz/coverity-fixes

Browse Source 
A few small fixups for stuff found by coverity
This commit is contained in:
Lennart Poettering 2020-03-30 17:18:35 +02:00 committed by GitHub
commit fef7397022
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 57 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/basic/meson.build
View File

@ -171,6 +171,7 @@ basic_sources = files('''
process-util.h process-util.h
procfs-util.c procfs-util.c
procfs-util.h procfs-util.h
pthread-util.h
quota-util.c quota-util.c
quota-util.h quota-util.h
random-util.c random-util.c

16
src/basic/pthread-util.h Normal file
View File

@ -0,0 +1,16 @@
/* SPDX-License-Identifier: LGPL-2.1+ */
#pragma once
#include <pthread.h>
#include "macro.h"
static inline pthread_mutex_t* pthread_mutex_lock_assert(pthread_mutex_t *mutex) {
assert_se(pthread_mutex_lock(mutex) == 0);
return mutex;
}
static inline void pthread_mutex_unlock_assertp(pthread_mutex_t **mutexp) {
if (*mutexp)
assert_se(pthread_mutex_unlock(*mutexp) == 0);
}

100
src/nss-systemd/nss-systemd.c
View File

@ -9,6 +9,7 @@
#include "group-record-nss.h" #include "group-record-nss.h"
#include "macro.h" #include "macro.h"
#include "nss-util.h" #include "nss-util.h"
#include "pthread-util.h"
#include "signal-util.h" #include "signal-util.h"
#include "strv.h" #include "strv.h"
#include "user-util.h" #include "user-util.h"
@ -277,10 +278,11 @@ static enum nss_status nss_systemd_endent(GetentData *p) {
assert(p); assert(p);
assert_se(pthread_mutex_lock(&p->mutex) == 0); _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL;
_l = pthread_mutex_lock_assert(&p->mutex);
p->iterator = userdb_iterator_free(p->iterator); p->iterator = userdb_iterator_free(p->iterator);
p->by_membership = false; p->by_membership = false;
assert_se(pthread_mutex_unlock(&p->mutex) == 0);
return NSS_STATUS_SUCCESS; return NSS_STATUS_SUCCESS;
} }
@ -294,45 +296,41 @@ enum nss_status _nss_systemd_endgrent(void) {
} }
enum nss_status _nss_systemd_setpwent(int stayopen) { enum nss_status _nss_systemd_setpwent(int stayopen) {
enum nss_status ret;
PROTECT_ERRNO; PROTECT_ERRNO;
BLOCK_SIGNALS(NSS_SIGNALS_BLOCK); BLOCK_SIGNALS(NSS_SIGNALS_BLOCK);
if (userdb_nss_compat_is_enabled() <= 0) if (userdb_nss_compat_is_enabled() <= 0)
return NSS_STATUS_NOTFOUND; return NSS_STATUS_NOTFOUND;
assert_se(pthread_mutex_lock(&getpwent_data.mutex) == 0); _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL;
int r;
_l = pthread_mutex_lock_assert(&getpwent_data.mutex);
getpwent_data.iterator = userdb_iterator_free(getpwent_data.iterator); getpwent_data.iterator = userdb_iterator_free(getpwent_data.iterator);
getpwent_data.by_membership = false; getpwent_data.by_membership = false;
ret = userdb_all(nss_glue_userdb_flags(), &getpwent_data.iterator) < 0 ? r = userdb_all(nss_glue_userdb_flags(), &getpwent_data.iterator);
NSS_STATUS_UNAVAIL : NSS_STATUS_SUCCESS; return r < 0 ? NSS_STATUS_UNAVAIL : NSS_STATUS_SUCCESS;
assert_se(pthread_mutex_unlock(&getpwent_data.mutex) == 0);
return ret;
} }
enum nss_status _nss_systemd_setgrent(int stayopen) { enum nss_status _nss_systemd_setgrent(int stayopen) {
enum nss_status ret;
PROTECT_ERRNO; PROTECT_ERRNO;
BLOCK_SIGNALS(NSS_SIGNALS_BLOCK); BLOCK_SIGNALS(NSS_SIGNALS_BLOCK);
if (userdb_nss_compat_is_enabled() <= 0) if (userdb_nss_compat_is_enabled() <= 0)
return NSS_STATUS_NOTFOUND; return NSS_STATUS_NOTFOUND;
assert_se(pthread_mutex_lock(&getgrent_data.mutex) == 0); _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL;
int r;
_l = pthread_mutex_lock_assert(&getgrent_data.mutex);
getgrent_data.iterator = userdb_iterator_free(getgrent_data.iterator); getgrent_data.iterator = userdb_iterator_free(getgrent_data.iterator);
getpwent_data.by_membership = false; getpwent_data.by_membership = false;
ret = groupdb_all(nss_glue_userdb_flags(), &getgrent_data.iterator) < 0 ? r = groupdb_all(nss_glue_userdb_flags(), &getgrent_data.iterator);
NSS_STATUS_UNAVAIL : NSS_STATUS_SUCCESS; return r < 0 ? NSS_STATUS_UNAVAIL : NSS_STATUS_SUCCESS;
assert_se(pthread_mutex_unlock(&getgrent_data.mutex) == 0);
return ret;
} }
enum nss_status _nss_systemd_getpwent_r( enum nss_status _nss_systemd_getpwent_r(
@ -341,7 +339,6 @@ enum nss_status _nss_systemd_getpwent_r(
int *errnop) { int *errnop) {
_cleanup_(user_record_unrefp) UserRecord *ur = NULL; _cleanup_(user_record_unrefp) UserRecord *ur = NULL;
enum nss_status ret;
int r; int r;
PROTECT_ERRNO; PROTECT_ERRNO;
@ -359,40 +356,33 @@ enum nss_status _nss_systemd_getpwent_r(
if (!r) if (!r)
return NSS_STATUS_NOTFOUND; return NSS_STATUS_NOTFOUND;
assert_se(pthread_mutex_lock(&getpwent_data.mutex) == 0); _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL;
_l = pthread_mutex_lock_assert(&getpwent_data.mutex);
if (!getpwent_data.iterator) { if (!getpwent_data.iterator) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = EHOSTDOWN; *errnop = EHOSTDOWN;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
r = userdb_iterator_get(getpwent_data.iterator, &ur); r = userdb_iterator_get(getpwent_data.iterator, &ur);
if (r == -ESRCH) { if (r == -ESRCH)
ret = NSS_STATUS_NOTFOUND; return NSS_STATUS_NOTFOUND;
goto finish;
}
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
r = nss_pack_user_record(ur, result, buffer, buflen); r = nss_pack_user_record(ur, result, buffer, buflen);
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_TRYAGAIN; return NSS_STATUS_TRYAGAIN;
goto finish;
} }
ret = NSS_STATUS_SUCCESS; return NSS_STATUS_SUCCESS;
finish:
assert_se(pthread_mutex_unlock(&getpwent_data.mutex) == 0);
return ret;
} }
enum nss_status _nss_systemd_getgrent_r( enum nss_status _nss_systemd_getgrent_r(
@ -402,7 +392,6 @@ enum nss_status _nss_systemd_getgrent_r(
_cleanup_(group_record_unrefp) GroupRecord *gr = NULL; _cleanup_(group_record_unrefp) GroupRecord *gr = NULL;
_cleanup_free_ char **members = NULL; _cleanup_free_ char **members = NULL;
enum nss_status ret;
int r; int r;
PROTECT_ERRNO; PROTECT_ERRNO;
@ -420,19 +409,20 @@ enum nss_status _nss_systemd_getgrent_r(
if (!r) if (!r)
return NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
assert_se(pthread_mutex_lock(&getgrent_data.mutex) == 0); _cleanup_(pthread_mutex_unlock_assertp) pthread_mutex_t *_l = NULL;
_l = pthread_mutex_lock_assert(&getgrent_data.mutex);
if (!getgrent_data.iterator) { if (!getgrent_data.iterator) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = EHOSTDOWN; *errnop = EHOSTDOWN;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
if (!getgrent_data.by_membership) { if (!getgrent_data.by_membership) {
r = groupdb_iterator_get(getgrent_data.iterator, &gr); r = groupdb_iterator_get(getgrent_data.iterator, &gr);
if (r == -ESRCH) { if (r == -ESRCH) {
/* So we finished iterating native groups now. let's now continue with iterating /* So we finished iterating native groups now. Let's now continue with iterating
* native memberships, and generate additional group entries for any groups * native memberships, and generate additional group entries for any groups
* referenced there that are defined in NSS only. This means for those groups there * referenced there that are defined in NSS only. This means for those groups there
* will be two or more entries generated during iteration, but this is apparently how * will be two or more entries generated during iteration, but this is apparently how
@ -444,23 +434,20 @@ enum nss_status _nss_systemd_getgrent_r(
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
getgrent_data.by_membership = true; getgrent_data.by_membership = true;
} else if (r < 0) { } else if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} else if (!STR_IN_SET(gr->group_name, root_group.gr_name, nobody_group.gr_name)) { } else if (!STR_IN_SET(gr->group_name, root_group.gr_name, nobody_group.gr_name)) {
r = membershipdb_by_group_strv(gr->group_name, nss_glue_userdb_flags(), &members); r = membershipdb_by_group_strv(gr->group_name, nss_glue_userdb_flags(), &members);
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
} }
} }
@ -472,15 +459,12 @@ enum nss_status _nss_systemd_getgrent_r(
_cleanup_free_ char *user_name = NULL, *group_name = NULL; _cleanup_free_ char *user_name = NULL, *group_name = NULL;
r = membershipdb_iterator_get(getgrent_data.iterator, &user_name, &group_name); r = membershipdb_iterator_get(getgrent_data.iterator, &user_name, &group_name);
if (r == -ESRCH) { if (r == -ESRCH)
ret = NSS_STATUS_NOTFOUND; return NSS_STATUS_NOTFOUND;
goto finish;
}
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
if (STR_IN_SET(user_name, root_passwd.pw_name, nobody_passwd.pw_name)) if (STR_IN_SET(user_name, root_passwd.pw_name, nobody_passwd.pw_name))
@ -494,8 +478,7 @@ enum nss_status _nss_systemd_getgrent_r(
if (lock_fd < 0 && lock_fd != -EBUSY) { if (lock_fd < 0 && lock_fd != -EBUSY) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -lock_fd; *errnop = -lock_fd;
ret = NSS_STATUS_UNAVAIL; return NSS_STATUS_UNAVAIL;
goto finish;
} }
} }
@ -525,15 +508,10 @@ enum nss_status _nss_systemd_getgrent_r(
if (r < 0) { if (r < 0) {
UNPROTECT_ERRNO; UNPROTECT_ERRNO;
*errnop = -r; *errnop = -r;
ret = NSS_STATUS_TRYAGAIN; return NSS_STATUS_TRYAGAIN;
goto finish;
} }
ret = NSS_STATUS_SUCCESS; return NSS_STATUS_SUCCESS;
finish:
assert_se(pthread_mutex_unlock(&getgrent_data.mutex) == 0);
return ret;
} }
enum nss_status _nss_systemd_initgroups_dyn( enum nss_status _nss_systemd_initgroups_dyn(

2
src/test/test-strv.c
View File

@ -674,7 +674,7 @@ static void test_strv_push_prepend(void) {
log_info("/* %s */", __func__); log_info("/* %s */", __func__);
a = strv_new("foo", "bar", "three"); assert_se(a = strv_new("foo", "bar", "three"));
assert_se(strv_push_prepend(&a, strdup("first")) >= 0); assert_se(strv_push_prepend(&a, strdup("first")) >= 0);
assert_se(streq(a[0], "first")); assert_se(streq(a[0], "first"));