summaryrefslogtreecommitdiff
path: root/src/core/selinux-access.c
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-02-06 21:16:08 +0100
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2020-02-06 22:27:12 +0100
commit22cd7aabecd81fca14026749e48eadddff98a4bd (patch)
tree5af2ddfadff985f7fa1775c08810695828b42a27 /src/core/selinux-access.c
parent949fb07e6e3e24f2a91a5ef940ee13894b0ecef5 (diff)
downloadsystemd-22cd7aabecd81fca14026749e48eadddff98a4bd.tar.gz
core/selinux-access: do not use NULL for %s
../src/core/selinux-access.c: In function ‘mac_selinux_generic_access_check’: ../src/basic/log.h:223:27: error: ‘%s’ directive argument is null [-Werror=format-overflow=] ../src/core/selinux-access.c:235:85: note: format string is defined here 235 | log_warning_errno(errno, "SELinux getcon_raw failed (tclass=%s perm=%s): %m", tclass, permission); | ^~ I wonder why nobody ever noticed this. Fixes #14691 (other issues listed in that ticket have already been fixed).
Diffstat (limited to 'src/core/selinux-access.c')
-rw-r--r--src/core/selinux-access.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/core/selinux-access.c b/src/core/selinux-access.c
index fb38231702..2ad500d539 100644
--- a/src/core/selinux-access.c
+++ b/src/core/selinux-access.c
@@ -181,7 +181,7 @@ int mac_selinux_generic_access_check(
sd_bus_error *error) {
_cleanup_(sd_bus_creds_unrefp) sd_bus_creds *creds = NULL;
- const char *tclass = NULL, *scon = NULL;
+ const char *tclass, *scon;
struct audit_info audit_info = {};
_cleanup_free_ char *cl = NULL;
char *fcon = NULL;
@@ -223,7 +223,7 @@ int mac_selinux_generic_access_check(
r = getfilecon_raw(path, &fcon);
if (r < 0) {
- log_warning_errno(errno, "SELinux getfilecon_raw on '%s' failed (tclass=%s perm=%s): %m", path, tclass, permission);
+ log_warning_errno(errno, "SELinux getfilecon_raw on '%s' failed (perm=%s): %m", path, permission);
r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get file context on %s.", path);
goto finish;
}
@@ -232,7 +232,7 @@ int mac_selinux_generic_access_check(
} else {
r = getcon_raw(&fcon);
if (r < 0) {
- log_warning_errno(errno, "SELinux getcon_raw failed (tclass=%s perm=%s): %m", tclass, permission);
+ log_warning_errno(errno, "SELinux getcon_raw failed (perm=%s): %m", permission);
r = sd_bus_error_setf(error, SD_BUS_ERROR_ACCESS_DENIED, "Failed to get current context.");
goto finish;
}