isa/sudo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use string_to_security_class() instead of pulling SECCLASS_CHR_FILE

Browse Source 
from flask.h.  Avoids a warning with new SELinux includes.
This commit is contained in:
Todd C. Miller
2016-04-22 11:36:08 -06:00
parent 6717c32022
commit 70cf5674b5
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/selinux.c
View File

@@ -38,7 +38,6 @@
#include <fcntl.h> #include <fcntl.h>
#include <signal.h> #include <signal.h>
#include <selinux/flask.h> /* for SECCLASS_CHR_FILE */
#include <selinux/selinux.h> /* for is_selinux_enabled() */ #include <selinux/selinux.h> /* for is_selinux_enabled() */
#include <selinux/context.h> /* for context-mangling functions */ #include <selinux/context.h> /* for context-mangling functions */
#include <selinux/get_default_type.h> #include <selinux/get_default_type.h>
@@ -177,11 +176,19 @@ relabel_tty(const char *ttyn, int ptyfd)
goto bad; goto bad;
} }
if (tty_con && (security_compute_relabel(se_state.new_context, tty_con, if (tty_con) {
SECCLASS_CHR_FILE, &new_tty_con) < 0)) { security_class_t tclass = string_to_security_class("chr_file");
sudo_warn(U_("unable to get new tty context, not relabeling tty")); if (tclass == 0) {
if (se_state.enforcing) sudo_warn(U_("unknown security class chr_file, not relabeling tty"));
goto bad; if (se_state.enforcing)
goto bad;
}
if (security_compute_relabel(se_state.new_context, tty_con,
tclass, &new_tty_con) < 0) {
sudo_warn(U_("unable to get new tty context, not relabeling tty"));
if (se_state.enforcing)
goto bad;
}
} }
if (new_tty_con != NULL) { if (new_tty_con != NULL) {