|
 |
1e6979 |
From d2d52704624ce841f4a392fccd82079d87ff13b6 Mon Sep 17 00:00:00 2001
|
|
|
1e6979 |
From: Jan Grulich <jgrulich@redhat.com>
|
|
|
1e6979 |
Date: Thu, 11 Nov 2021 13:52:41 +0100
|
|
|
1e6979 |
Subject: [PATCH] SELinux: restore SELinux context in case of different
|
|
|
1e6979 |
policies
|
|
|
1e6979 |
|
|
|
1e6979 |
---
|
|
|
1e6979 |
CMakeLists.txt | 13 +++++++++++++
|
|
|
1e6979 |
unix/vncserver/CMakeLists.txt | 2 +-
|
|
|
1e6979 |
unix/vncserver/vncsession.c | 16 ++++++++++++++++
|
|
|
1e6979 |
3 files changed, 30 insertions(+), 1 deletion(-)
|
|
|
1e6979 |
|
|
|
1e6979 |
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
|
324a25 |
index 50247c7da..1708eb3d8 100644
|
|
|
1e6979 |
--- a/CMakeLists.txt
|
|
|
1e6979 |
+++ b/CMakeLists.txt
|
|
|
324a25 |
@@ -268,6 +268,19 @@ if(UNIX AND NOT APPLE)
|
|
|
1e6979 |
endif()
|
|
|
1e6979 |
endif()
|
|
|
1e6979 |
|
|
|
1e6979 |
+# Check for SELinux library
|
|
|
1e6979 |
+if(UNIX AND NOT APPLE)
|
|
|
1e6979 |
+ check_include_files(selinux/selinux.h HAVE_SELINUX_H)
|
|
|
1e6979 |
+ if(HAVE_SELINUX_H)
|
|
|
1e6979 |
+ set(CMAKE_REQUIRED_LIBRARIES -lselinux)
|
|
|
1e6979 |
+ set(CMAKE_REQUIRED_LIBRARIES)
|
|
|
1e6979 |
+ set(SELINUX_LIBS selinux)
|
|
|
1e6979 |
+ add_definitions("-DHAVE_SELINUX")
|
|
|
1e6979 |
+ else()
|
|
|
1e6979 |
+ message(WARNING "Could not find SELinux development files")
|
|
|
1e6979 |
+ endif()
|
|
|
1e6979 |
+endif()
|
|
|
1e6979 |
+
|
|
|
1e6979 |
# Generate config.h and make sure the source finds it
|
|
|
1e6979 |
configure_file(config.h.in config.h)
|
|
|
1e6979 |
add_definitions(-DHAVE_CONFIG_H)
|
|
|
1e6979 |
diff --git a/unix/vncserver/CMakeLists.txt b/unix/vncserver/CMakeLists.txt
|
|
|
324a25 |
index f65ccc7db..ae69dc098 100644
|
|
|
1e6979 |
--- a/unix/vncserver/CMakeLists.txt
|
|
|
1e6979 |
+++ b/unix/vncserver/CMakeLists.txt
|
|
|
1e6979 |
@@ -1,5 +1,5 @@
|
|
|
1e6979 |
add_executable(vncsession vncsession.c)
|
|
|
1e6979 |
-target_link_libraries(vncsession ${PAM_LIBS})
|
|
|
1e6979 |
+target_link_libraries(vncsession ${PAM_LIBS} ${SELINUX_LIBS})
|
|
|
1e6979 |
|
|
|
1e6979 |
configure_file(vncserver@.service.in vncserver@.service @ONLY)
|
|
|
1e6979 |
configure_file(vncsession-start.in vncsession-start @ONLY)
|
|
|
1e6979 |
diff --git a/unix/vncserver/vncsession.c b/unix/vncserver/vncsession.c
|
|
|
324a25 |
index 3573e5e9b..f6d2fd59e 100644
|
|
|
1e6979 |
--- a/unix/vncserver/vncsession.c
|
|
|
1e6979 |
+++ b/unix/vncserver/vncsession.c
|
|
|
1e6979 |
@@ -37,6 +37,11 @@
|
|
|
1e6979 |
#include <sys/types.h>
|
|
|
1e6979 |
#include <sys/wait.h>
|
|
|
1e6979 |
|
|
|
1e6979 |
+#ifdef HAVE_SELINUX
|
|
|
1e6979 |
+#include <selinux/selinux.h>
|
|
|
1e6979 |
+#include <selinux/restorecon.h>
|
|
|
1e6979 |
+#endif
|
|
|
1e6979 |
+
|
|
|
1e6979 |
extern char **environ;
|
|
|
1e6979 |
|
|
|
1e6979 |
// PAM service name
|
|
|
324a25 |
@@ -360,6 +365,17 @@ redir_stdio(const char *homedir, const char *display)
|
|
|
324a25 |
syslog(LOG_CRIT, "Failure creating \"%s\": %s", logfile, strerror(errno));
|
|
|
1e6979 |
_exit(EX_OSERR);
|
|
|
1e6979 |
}
|
|
|
1e6979 |
+
|
|
|
1e6979 |
+#ifdef HAVE_SELINUX
|
|
|
1e6979 |
+ int result;
|
|
|
1e6979 |
+ if (selinux_file_context_verify(logfile, 0) == 0) {
|
|
|
1e6979 |
+ result = selinux_restorecon(logfile, SELINUX_RESTORECON_RECURSE);
|
|
|
1e6979 |
+
|
|
|
1e6979 |
+ if (result < 0) {
|
|
|
1e6979 |
+ syslog(LOG_WARNING, "Failure restoring SELinux context for \"%s\": %s", logfile, strerror(errno));
|
|
|
1e6979 |
+ }
|
|
|
1e6979 |
+ }
|
|
|
1e6979 |
+#endif
|
|
|
1e6979 |
}
|
|
|
1e6979 |
|
|
|
324a25 |
hostlen = sysconf(_SC_HOST_NAME_MAX);
|