summaryrefslogtreecommitdiff
path: root/src/analyze/analyze-security.c
diff options
context:
space:
mode:
authorDavid Tardon <dtardon@redhat.com>2022-08-09 14:35:15 +0200
committerDavid Tardon <dtardon@redhat.com>2022-09-13 08:13:27 +0200
commit995340074e554b4bf4a0fdb0cb7436692c5a4ffd (patch)
treeca3ee001db3e608ee80478f42fea9c3b409f1b7b /src/analyze/analyze-security.c
parent6d64cb0625691e2b9eda8babe07ac8281f9467ee (diff)
downloadsystemd-995340074e554b4bf4a0fdb0cb7436692c5a4ffd.tar.gz
tree-wide: use ASSERT_PTR more
Diffstat (limited to 'src/analyze/analyze-security.c')
-rw-r--r--src/analyze/analyze-security.c12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/analyze/analyze-security.c b/src/analyze/analyze-security.c
index d4858f77c5..69eab91bdb 100644
--- a/src/analyze/analyze-security.c
+++ b/src/analyze/analyze-security.c
@@ -199,9 +199,8 @@ static int assess_bool(
uint64_t *ret_badness,
char **ret_description) {
- const bool *b = data;
+ const bool *b = ASSERT_PTR(data);
- assert(b);
assert(ret_badness);
assert(ret_description);
@@ -1960,14 +1959,13 @@ static int property_read_restrict_namespaces(
sd_bus_error *error,
void *userdata) {
- SecurityInfo *info = userdata;
+ SecurityInfo *info = ASSERT_PTR(userdata);
int r;
uint64_t namespaces;
assert(bus);
assert(member);
assert(m);
- assert(info);
r = sd_bus_message_read(m, "t", &namespaces);
if (r < 0)
@@ -1985,14 +1983,13 @@ static int property_read_umask(
sd_bus_error *error,
void *userdata) {
- SecurityInfo *info = userdata;
+ SecurityInfo *info = ASSERT_PTR(userdata);
int r;
uint32_t umask;
assert(bus);
assert(member);
assert(m);
- assert(info);
r = sd_bus_message_read(m, "u", &umask);
if (r < 0)
@@ -2070,13 +2067,12 @@ static int property_read_syscall_archs(
sd_bus_error *error,
void *userdata) {
- SecurityInfo *info = userdata;
+ SecurityInfo *info = ASSERT_PTR(userdata);
int r;
assert(bus);
assert(member);
assert(m);
- assert(info);
r = sd_bus_message_enter_container(m, 'a', "s");
if (r < 0)