From 9da725c52e6a743a1c30257a85a9cf6ccc95042e Mon Sep 17 00:00:00 2001 From: Dominick Grift Date: Thu, 25 Apr 2024 15:52:48 +0200 Subject: adds a ttynodedev and TIOCLINUX filtering support Signed-off-by: Dominick Grift --- src/dev/termdev/ptytermdev.cil | 12 ++++++------ src/dev/termdev/ptytermdev/loginptytermdev.cil | 6 +++--- src/dev/termdev/serialtermdev.cil | 12 ++++++------ src/dev/termdev/serialtermdev/loginserialtermdev.cil | 6 +++--- 4 files changed, 18 insertions(+), 18 deletions(-) (limited to 'src/dev/termdev') diff --git a/src/dev/termdev/ptytermdev.cil b/src/dev/termdev/ptytermdev.cil index 1818854..0a5f93e 100644 --- a/src/dev/termdev/ptytermdev.cil +++ b/src/dev/termdev/ptytermdev.cil @@ -32,7 +32,7 @@ (macro appendinherited_ptytermdev_chr_files ((type ARG1)) (allow ARG1 ptytermdev appendinherited_chr_file) - (allowx ARG1 ptytermdev IOCTLCONSOLE) + (allowx ARG1 ptytermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 ptytermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 ptytermdev IOCTLVT)) @@ -59,7 +59,7 @@ (macro readwriteinherited_ptytermdev_chr_files ((type ARG1)) (allow ARG1 ptytermdev readwriteinherited_chr_file) - (allowx ARG1 ptytermdev IOCTLCONSOLE) + (allowx ARG1 ptytermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 ptytermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 ptytermdev IOCTLVT)) @@ -80,7 +80,7 @@ (macro writeinherited_ptytermdev_chr_files ((type ARG1)) (allow ARG1 ptytermdev writeinherited_chr_file) - (allowx ARG1 ptytermdev IOCTLCONSOLE) + (allowx ARG1 ptytermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 ptytermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 ptytermdev IOCTLVT))) @@ -101,16 +101,16 @@ (allow typeattr ptytermdev.typeattr (chr_file (not (audit_access execmod)))))) (in after ptytermdev.appendinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after ptytermdev.readwriteinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after ptytermdev.writeinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) diff --git a/src/dev/termdev/ptytermdev/loginptytermdev.cil b/src/dev/termdev/ptytermdev/loginptytermdev.cil index c8ca794..9e94db0 100644 --- a/src/dev/termdev/ptytermdev/loginptytermdev.cil +++ b/src/dev/termdev/ptytermdev/loginptytermdev.cil @@ -34,16 +34,16 @@ (blockinherit .ptytermdev.macro_template_chr_files))) (in after loginptytermdev.appendinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after loginptytermdev.readwriteinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after loginptytermdev.writeinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) diff --git a/src/dev/termdev/serialtermdev.cil b/src/dev/termdev/serialtermdev.cil index 45d2290..4e06669 100644 --- a/src/dev/termdev/serialtermdev.cil +++ b/src/dev/termdev/serialtermdev.cil @@ -31,7 +31,7 @@ (macro appendinherited_serialtermdev_chr_files ((type ARG1)) (allow ARG1 serialtermdev appendinherited_chr_file) - (allowx ARG1 serialtermdev IOCTLCONSOLE) + (allowx ARG1 serialtermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 serialtermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 serialtermdev IOCTLVT)) @@ -58,7 +58,7 @@ (macro readwriteinherited_serialtermdev_chr_files ((type ARG1)) (allow ARG1 serialtermdev readwriteinherited_chr_file) - (allowx ARG1 serialtermdev IOCTLCONSOLE) + (allowx ARG1 serialtermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 serialtermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 serialtermdev IOCTLVT)) @@ -79,7 +79,7 @@ (macro writeinherited_serialtermdev_chr_files ((type ARG1)) (allow ARG1 serialtermdev writeinherited_chr_file) - (allowx ARG1 serialtermdev IOCTLCONSOLE) + (allowx ARG1 serialtermdev IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 serialtermdev IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 serialtermdev IOCTLVT))) @@ -100,16 +100,16 @@ (allow typeattr serialtermdev.typeattr (chr_file (not (audit_access execmod)))))) (in after serialtermdev.appendinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after serialtermdev.readwriteinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after serialtermdev.writeinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) diff --git a/src/dev/termdev/serialtermdev/loginserialtermdev.cil b/src/dev/termdev/serialtermdev/loginserialtermdev.cil index fdc8f51..e480302 100644 --- a/src/dev/termdev/serialtermdev/loginserialtermdev.cil +++ b/src/dev/termdev/serialtermdev/loginserialtermdev.cil @@ -34,16 +34,16 @@ (blockinherit .serialtermdev.macro_template_chr_files))) (in after loginserialtermdev.appendinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after loginserialtermdev.readwriteinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) (in after loginserialtermdev.writeinherited_all_chr_files - (allowx ARG1 typeattr IOCTLCONSOLE) + (allowx ARG1 typeattr IOCTLCONSOLE_NOT_TIOCLINUX) (allowx ARG1 typeattr IOCTLTTY_NOT_TIOCSTI) (allowx ARG1 typeattr IOCTLVT)) -- cgit v1.2.3