From: David Woodhouse <dwmw2@shinybook.infradead.org>
Date: Thu, 19 May 2005 10:54:00 +0000 (+0100)
Subject: Merge with master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6.git
X-Git-Tag: daily-2014.03.25.0_l4t/l4t-r19.1~51681^2~52
X-Git-Url: https://nv-tegra.nvidia.com/r/gitweb?p=linux-3.10.git;a=commitdiff_plain;h=7063e6c717f6108c4b3fc3135a516c86ef944870;hp=-c

Merge ... /linux/kernel/git/torvalds/linux-2.6.git
---

7063e6c717f6108c4b3fc3135a516c86ef944870
diff --combined security/selinux/ss/services.c
index 07fdf6ee614,8449d667b06..b6149147d5c
--- a/security/selinux/ss/services.c
+++ b/security/selinux/ss/services.c
@@@ -365,7 -365,7 +365,7 @@@ static int security_validtrans_handle_f
  		goto out;
  	if (context_struct_to_string(tcontext, &t, &tlen) < 0)
  		goto out;
 -	audit_log(current->audit_context,
 +	audit_log(current->audit_context, AUDIT_SELINUX_ERR,
  	          "security_validate_transition:  denied for"
  	          " oldcontext=%s newcontext=%s taskcontext=%s tclass=%s",
  	          o, n, t, policydb.p_class_val_to_name[tclass-1]);
@@@ -476,8 -476,8 +476,8 @@@ int security_compute_av(u32 ssid
  	int rc = 0;
  
  	if (!ss_initialized) {
- 		avd->allowed = requested;
- 		avd->decided = requested;
+ 		avd->allowed = 0xffffffff;
+ 		avd->decided = 0xffffffff;
  		avd->auditallow = 0;
  		avd->auditdeny = 0xffffffff;
  		avd->seqno = latest_granting;
@@@ -742,7 -742,7 +742,7 @@@ static int compute_sid_handle_invalid_c
  		goto out;
  	if (context_struct_to_string(newcontext, &n, &nlen) < 0)
  		goto out;
 -	audit_log(current->audit_context,
 +	audit_log(current->audit_context, AUDIT_SELINUX_ERR,
  		  "security_compute_sid:  invalid context %s"
  		  " for scontext=%s"
  		  " tcontext=%s"
@@@ -1196,9 -1196,11 +1196,11 @@@ int security_load_policy(void *data, si
  		}
  		policydb_loaded_version = policydb.policyvers;
  		ss_initialized = 1;
- 
+ 		seqno = ++latest_granting;
  		LOAD_UNLOCK;
  		selinux_complete_init();
+ 		avc_ss_reset(seqno);
+ 		selnl_notify_policyload(seqno);
  		return 0;
  	}