emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

selinux.c: do not use deprecated typedef and skip context translation

Browse Source 
These retrieved contexts are just passed to libselinux functions and not
printed or otherwise made available to the outside, so a context
translation to human readable MCS/MLS labels is not needed.
(see man:setrans.conf(5))

The typedef security_context_t is deprecated, see
9eb9c93275

Signed-off-by: Christian Göttsche <cgzones@googlemail.com>
Acked-by: James Carter <jwcart2@gmail.com>
This commit is contained in:
Christian Göttsche 2021-04-09 18:20:51 +02:00
parent c0aa8a876e
commit 95fd179683
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/selinux.c
View File

@ -53,7 +53,7 @@ static bool selinux_enabled;
*/ */
int set_selinux_file_context (const char *dst_name) int set_selinux_file_context (const char *dst_name)
{ {
/*@null@*/security_context_t scontext = NULL; /*@null@*/char *scontext = NULL;
if (!selinux_checked) { if (!selinux_checked) {
selinux_enabled = is_selinux_enabled () > 0; selinux_enabled = is_selinux_enabled () > 0;
@ -93,7 +93,7 @@ int reset_selinux_file_context (void)
selinux_checked = true; selinux_checked = true;
} }
if (selinux_enabled) { if (selinux_enabled) {
if (setfscreatecon (NULL) != 0) { if (setfscreatecon_raw (NULL) != 0) {
return 1; return 1;
} }
} }
@ -175,7 +175,7 @@ skip_syslog:
*/ */
int check_selinux_permit (const char *perm_name) int check_selinux_permit (const char *perm_name)
{ {
char *user_context_str; char *user_context_raw;
int r; int r;
if (0 == is_selinux_enabled ()) { if (0 == is_selinux_enabled ()) {
@ -184,7 +184,7 @@ int check_selinux_permit (const char *perm_name)
selinux_set_callback (SELINUX_CB_LOG, (union selinux_callback) selinux_log_cb); selinux_set_callback (SELINUX_CB_LOG, (union selinux_callback) selinux_log_cb);
if (getprevcon (&user_context_str) != 0) { if (getprevcon_raw (&user_context_raw) != 0) {
fprintf (stderr, fprintf (stderr,
_("%s: can not get previous SELinux process context: %s\n"), _("%s: can not get previous SELinux process context: %s\n"),
Prog, strerror (errno)); Prog, strerror (errno));
@ -194,8 +194,8 @@ int check_selinux_permit (const char *perm_name)
return (security_getenforce () != 0); return (security_getenforce () != 0);
} }
r = selinux_check_access (user_context_str, user_context_str, "passwd", perm_name, NULL); r = selinux_check_access (user_context_raw, user_context_raw, "passwd", perm_name, NULL);
freecon (user_context_str); freecon (user_context_raw);
return r; return r;
} }