httpd/SOURCES/httpd-2.4.57-selinux.patch

61 lines
1.7 KiB
Diff
Raw Permalink Normal View History

2021-11-02 20:04:17 +00:00
diff --git a/configure.in b/configure.in
2024-09-30 15:41:02 +00:00
index 3932407..00e2369 100644
2021-11-02 20:04:17 +00:00
--- a/configure.in
+++ b/configure.in
2024-09-30 15:41:02 +00:00
@@ -531,6 +531,11 @@ gettid
2021-11-02 20:04:17 +00:00
dnl confirm that a void pointer is large enough to store a long integer
APACHE_CHECK_VOID_PTR_LEN
+AC_CHECK_LIB(selinux, is_selinux_enabled, [
+ AC_DEFINE(HAVE_SELINUX, 1, [Defined if SELinux is supported])
+ APR_ADDTO(HTTPD_LIBS, [-lselinux])
+])
+
2024-09-30 15:41:02 +00:00
if test $ac_cv_func_gettid = no; then
# On Linux before glibc 2.30, gettid() is only usable via syscall()
AC_CACHE_CHECK([for gettid() via syscall], ap_cv_gettid,
2021-11-02 20:04:17 +00:00
diff --git a/server/core.c b/server/core.c
2024-09-30 15:41:02 +00:00
index 8970a50..ff1024d 100644
2021-11-02 20:04:17 +00:00
--- a/server/core.c
+++ b/server/core.c
2023-09-21 18:50:52 +00:00
@@ -65,6 +65,10 @@
2021-11-02 20:04:17 +00:00
#include <unistd.h>
#endif
+#ifdef HAVE_SELINUX
+#include <selinux/selinux.h>
+#endif
+
/* LimitRequestBody handling */
#define AP_LIMIT_REQ_BODY_UNSET ((apr_off_t) -1)
2023-09-21 18:50:52 +00:00
#define AP_DEFAULT_LIMIT_REQ_BODY ((apr_off_t) 1<<30) /* 1GB */
2024-09-30 15:41:02 +00:00
@@ -5170,6 +5174,28 @@ static int core_post_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *pte
2021-11-02 20:04:17 +00:00
}
#endif
+#ifdef HAVE_SELINUX
+ {
+ static int already_warned = 0;
+ int is_enabled = is_selinux_enabled() > 0;
+
+ if (is_enabled && !already_warned) {
+ security_context_t con;
+
+ if (getcon(&con) == 0) {
+
+ ap_log_error(APLOG_MARK, APLOG_NOTICE, 0, NULL,
+ "SELinux policy enabled; "
+ "httpd running as context %s", con);
+
+ already_warned = 1;
+
+ freecon(con);
+ }
+ }
+ }
+#endif
+
return OK;
}