diff options
| author | James Morris <jmorris@namei.org> | 2012-01-09 12:16:48 +1100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2012-01-09 12:16:48 +1100 |
| commit | 8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8 (patch) | |
| tree | a118eaef15d4ba22247f45ee01537ecc906cd161 /security/tomoyo | |
| parent | 805a6af8dba5dfdd35ec35dc52ec0122400b2610 (diff) | |
| parent | 7b7e5916aa2f46e57f8bd8cb89c34620ebfda5da (diff) | |
| download | linux-8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8.tar.gz linux-8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8.tar.bz2 linux-8fcc99549522fc7a0bbaeb5755855ab0d9a59ce8.zip | |
Merge branch 'next' into for-linus
Conflicts:
security/integrity/evm/evm_crypto.c
Resolved upstream fix vs. next conflict manually.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'security/tomoyo')
| -rw-r--r-- | security/tomoyo/.gitignore | 2 | ||||
| -rw-r--r-- | security/tomoyo/common.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/security/tomoyo/.gitignore b/security/tomoyo/.gitignore new file mode 100644 index 000000000000..5caf1a6f5907 --- /dev/null +++ b/security/tomoyo/.gitignore @@ -0,0 +1,2 @@ +builtin-policy.h +policy/ diff --git a/security/tomoyo/common.h b/security/tomoyo/common.h index ed311d7a8ce0..cb9f5c2d6f3a 100644 --- a/security/tomoyo/common.h +++ b/security/tomoyo/common.h @@ -1122,7 +1122,7 @@ static inline pid_t tomoyo_sys_getppid(void) { pid_t pid; rcu_read_lock(); - pid = task_tgid_vnr(current->real_parent); + pid = task_tgid_vnr(rcu_dereference(current->real_parent)); rcu_read_unlock(); return pid; } |