commit | 9bcf73f48280ef8cd7f2e38e674da47c409b9906 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 09:00:47 2009 -0700 |
committer | Linus Torvalds <torvalds@linux-foundation.org> | Mon Aug 10 09:00:47 2009 -0700 |
tree | 8f2c8de4dc437ce901c8b15f437a0394481ef44a | |
parent | 2c661a669b3e2e34311d7965271a628671191e45 [diff] | |
parent | 704b836cbf19e885f8366bccb2e4b0474346c02d [diff] |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6 * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6: mm_for_maps: take ->cred_guard_mutex to fix the race with exec mm_for_maps: shift down_read(mmap_sem) to the caller mm_for_maps: simplify, use ptrace_may_access()