diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 00:51:23 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-11 00:51:23 -0500 |
commit | e7691a1ce341c80ed9504244a36b31c025217391 (patch) | |
tree | e9941bb350f64a726130e299c411821da6f41a53 /security/apparmor/audit.c | |
parent | 5cd9599bba428762025db6027764f1c59d0b1e1b (diff) | |
parent | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 (diff) |
Merge branch 'for-linus' of git://selinuxproject.org/~jmorris/linux-security
* 'for-linus' of git://selinuxproject.org/~jmorris/linux-security: (32 commits)
ima: fix invalid memory reference
ima: free duplicate measurement memory
security: update security_file_mmap() docs
selinux: Casting (void *) value returned by kmalloc is useless
apparmor: fix module parameter handling
Security: tomoyo: add .gitignore file
tomoyo: add missing rcu_dereference()
apparmor: add missing rcu_dereference()
evm: prevent racing during tfm allocation
evm: key must be set once during initialization
mpi/mpi-mpow: NULL dereference on allocation failure
digsig: build dependency fix
KEYS: Give key types their own lockdep class for key->sem
TPM: fix transmit_cmd error logic
TPM: NSC and TIS drivers X86 dependency fix
TPM: Export wait_for_stat for other vendor specific drivers
TPM: Use vendor specific function for status probe
tpm_tis: add delay after aborting command
tpm_tis: Check return code from getting timeouts/durations
tpm: Introduce function to poll for result of self test
...
Fix up trivial conflict in lib/Makefile due to addition of CONFIG_MPI
and SIGSIG next to CONFIG_DQL addition.
Diffstat (limited to 'security/apparmor/audit.c')
-rw-r--r-- | security/apparmor/audit.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/apparmor/audit.c b/security/apparmor/audit.c index 96502b22b26..f3fafedd798 100644 --- a/security/apparmor/audit.c +++ b/security/apparmor/audit.c | |||
@@ -133,7 +133,7 @@ static void audit_pre(struct audit_buffer *ab, void *ca) | |||
133 | struct aa_profile *profile = sa->aad.profile; | 133 | struct aa_profile *profile = sa->aad.profile; |
134 | pid_t pid; | 134 | pid_t pid; |
135 | rcu_read_lock(); | 135 | rcu_read_lock(); |
136 | pid = tsk->real_parent->pid; | 136 | pid = rcu_dereference(tsk->real_parent)->pid; |
137 | rcu_read_unlock(); | 137 | rcu_read_unlock(); |
138 | audit_log_format(ab, " parent=%d", pid); | 138 | audit_log_format(ab, " parent=%d", pid); |
139 | if (profile->ns != root_ns) { | 139 | if (profile->ns != root_ns) { |