diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-01-10 04:20:52 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2008-02-01 14:04:59 -0500 |
commit | 0c11b9428f619ab377c92eff2f160a834a6585dd (patch) | |
tree | 35b573715ad5730a77d067486838345132771a7a /security/selinux | |
parent | 24e1c13c93cbdd05e4b7ea921c0050b036555adc (diff) |
[PATCH] switch audit_get_loginuid() to task_struct *
all callers pass something->audit_context
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'security/selinux')
-rw-r--r-- | security/selinux/selinuxfs.c | 6 | ||||
-rw-r--r-- | security/selinux/ss/services.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/security/selinux/selinuxfs.c b/security/selinux/selinuxfs.c index a85740530afc..bee969432979 100644 --- a/security/selinux/selinuxfs.c +++ b/security/selinux/selinuxfs.c | |||
@@ -174,7 +174,7 @@ static ssize_t sel_write_enforce(struct file * file, const char __user * buf, | |||
174 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, | 174 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, |
175 | "enforcing=%d old_enforcing=%d auid=%u", new_value, | 175 | "enforcing=%d old_enforcing=%d auid=%u", new_value, |
176 | selinux_enforcing, | 176 | selinux_enforcing, |
177 | audit_get_loginuid(current->audit_context)); | 177 | audit_get_loginuid(current)); |
178 | selinux_enforcing = new_value; | 178 | selinux_enforcing = new_value; |
179 | if (selinux_enforcing) | 179 | if (selinux_enforcing) |
180 | avc_ss_reset(0); | 180 | avc_ss_reset(0); |
@@ -244,7 +244,7 @@ static ssize_t sel_write_disable(struct file * file, const char __user * buf, | |||
244 | goto out; | 244 | goto out; |
245 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, | 245 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_STATUS, |
246 | "selinux=0 auid=%u", | 246 | "selinux=0 auid=%u", |
247 | audit_get_loginuid(current->audit_context)); | 247 | audit_get_loginuid(current)); |
248 | } | 248 | } |
249 | 249 | ||
250 | length = count; | 250 | length = count; |
@@ -357,7 +357,7 @@ out1: | |||
357 | 357 | ||
358 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, | 358 | audit_log(current->audit_context, GFP_KERNEL, AUDIT_MAC_POLICY_LOAD, |
359 | "policy loaded auid=%u", | 359 | "policy loaded auid=%u", |
360 | audit_get_loginuid(current->audit_context)); | 360 | audit_get_loginuid(current)); |
361 | out: | 361 | out: |
362 | mutex_unlock(&sel_mutex); | 362 | mutex_unlock(&sel_mutex); |
363 | vfree(data); | 363 | vfree(data); |
diff --git a/security/selinux/ss/services.c b/security/selinux/ss/services.c index 880d455aa659..819a6f91e801 100644 --- a/security/selinux/ss/services.c +++ b/security/selinux/ss/services.c | |||
@@ -1909,7 +1909,7 @@ int security_set_bools(int len, int *values) | |||
1909 | policydb.p_bool_val_to_name[i], | 1909 | policydb.p_bool_val_to_name[i], |
1910 | !!values[i], | 1910 | !!values[i], |
1911 | policydb.bool_val_to_struct[i]->state, | 1911 | policydb.bool_val_to_struct[i]->state, |
1912 | audit_get_loginuid(current->audit_context)); | 1912 | audit_get_loginuid(current)); |
1913 | } | 1913 | } |
1914 | if (values[i]) { | 1914 | if (values[i]) { |
1915 | policydb.bool_val_to_struct[i]->state = 1; | 1915 | policydb.bool_val_to_struct[i]->state = 1; |