Attachment 144876 Details for Bug 220487 – update to Tomas' latest use_current_range patch

[patch] update to Tomas' latest use_current_range patch

pam-selinux-use-range-2.diff (text/plain), 3.36 KB, created by Klaus Weidner on 2007-01-05 00:37:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Klaus Weidner

Created: 2007-01-05 00:37:00 UTC

Size: 3.36 KB

patch

obsolete

>diff -ur Linux-PAM-0.99.6.2-levelselect/modules/pam_selinux/pam_selinux.8.xml Linux-PAM-0.99.6.2-kw/modules/pam_selinux/pam_selinux.8.xml
>--- Linux-PAM-0.99.6.2-levelselect/modules/pam_selinux/pam_selinux.8.xml	2007-01-03 20:04:09.000000000 -0600
>+++ Linux-PAM-0.99.6.2-kw/modules/pam_selinux/pam_selinux.8.xml	2007-01-03 19:36:07.000000000 -0600
>@@ -36,6 +36,9 @@
>       <arg choice="opt">
> 	select_context
>       </arg>
>+      <arg choice="opt">
>+	use_current_range
>+      </arg>
>     </cmdsynopsis>
>   </refsynopsisdiv>
> 
>@@ -132,6 +135,17 @@
>           </para>
>         </listitem>
>       </varlistentry>
>+      <varlistentry>
>+        <term>
>+          <option>use_current_range</option>
>+        </term>
>+        <listitem>
>+          <para>
>+            Use the sensitivity range of the process for the user context.
>+            This option and the select_context option are mutually exclusive.
>+          </para>
>+        </listitem>
>+      </varlistentry>
>     </variablelist>
>   </refsect1>
> 
>diff -ur Linux-PAM-0.99.6.2-levelselect/modules/pam_selinux/pam_selinux.c Linux-PAM-0.99.6.2-kw/modules/pam_selinux/pam_selinux.c
>--- Linux-PAM-0.99.6.2-levelselect/modules/pam_selinux/pam_selinux.c	2007-01-03 20:04:09.000000000 -0600
>+++ Linux-PAM-0.99.6.2-kw/modules/pam_selinux/pam_selinux.c	2007-01-03 20:12:07.000000000 -0600
>@@ -435,6 +435,7 @@
>   int i, debug = 0, ttys=1, has_tty=isatty(0);
>   int verbose=0, close_session=0;
>   int select_context = 0;
>+  int use_current_range = 0;
>   int ret = 0;
>   security_context_t* contextlist = NULL;
>   int num_contexts = 0;
>@@ -461,11 +462,19 @@
>     if (strcmp(argv[i], "select_context") == 0) {
>       select_context = 1;
>     }
>+    if (strcmp(argv[i], "use_current_range") == 0) {
>+      use_current_range = 1;
>+    }
>   }
>-
>+  
>   if (debug)
>     pam_syslog(pamh, LOG_NOTICE, "Open Session");
> 
>+  if (select_context && use_current_range) {
>+    pam_syslog(pamh, LOG_ERR, "select_context cannot be used with use_current_range");
>+    select_context = 0;
>+  }
>+
>   /* this module is only supposed to execute close_session */
>   if (close_session)
>       return PAM_SUCCESS;
>@@ -532,6 +541,43 @@
>           return PAM_SUCCESS;
>     }
>   }
>+
>+  if (use_current_range && is_selinux_mls_enabled()) {
>+    security_context_t process_context=NULL;
>+    if (getcon(&process_context) == 0) {
>+      context_t pcon, ucon;
>+      char *process_level=NULL;
>+
>+      pcon = context_new(process_context);
>+      freecon(process_context);
>+      process_level = strdup(context_range_get(pcon));
>+      context_free(pcon);
>+
>+      if (debug)
>+        pam_syslog (pamh, LOG_DEBUG, "process level=%s", process_level);
>+
>+      ucon = context_new(default_user_context);
>+      context_range_set(ucon, process_level);
>+      free(process_level);
>+
>+      if (!mls_range_allowed(pamh, default_user_context, context_str(ucon), debug)) {
>+	send_text(pamh, _("Requested MLS level not in permitted range"), debug);
>+	send_audit_message(pamh, 0, default_user_context, context_str(ucon));
>+	context_free(ucon);
>+	return PAM_AUTH_ERR;
>+      }
>+
>+      if (debug)
>+        pam_syslog (pamh, LOG_DEBUG, "adjusted context=%s", context_str(ucon));
>+
>+      /* replace the user context with the level adjusted one */
>+      freecon(user_context);
>+      user_context = strdup(context_str(ucon));
>+
>+      context_free(ucon);
>+    }
>+  }
>+
>   if (getexeccon(&prev_user_context)<0) {
>     prev_user_context=NULL;
>   }

Actions: View | Diff

Attachments on bug 220487: 144235 | 144260 | 144261 | 144314 | 144321 | 144325 | 144326 | 144865 | 144869 | 144870 | 144876 | 145433