summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2011-01-1021-1061/+3611
|\
| * Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into nextJames Morris2011-01-1010-930/+943
| |\
| | * SELinux: define permissions for DCB netlink messagesEric Paris2010-12-161-0/+2
| | * selinux: cache sidtab_context_to_sid resultsEric Paris2010-12-072-2/+39
| | * SELinux: do not compute transition labels on mountpoint labeled filesystemsEric Paris2010-12-021-1/+4
| | * SELinux: merge policydb_index_classes and policydb_index_othersEric Paris2010-11-301-59/+10
| | * selinux: convert part of the sym_val_to_name array to use flex_arrayEric Paris2010-11-305-68/+127
| | * selinux: convert type_val_to_struct to flex_arrayEric Paris2010-11-303-13/+34
| | * SELinux: do not set automatic i_ino in selinuxfsEric Paris2010-11-301-1/+0
| | * selinux: rework security_netlbl_secattr_to_sidEric Paris2010-11-301-21/+21
| | * SELinux: standardize return code handling in selinuxfs.cEric Paris2010-11-301-171/+157
| | * SELinux: standardize return code handling in selinuxfs.cEric Paris2010-11-301-337/+311
| | * SELinux: standardize return code handling in policydb.cEric Paris2010-11-301-287/+268
| * | Merge branch 'master' into nextJames Morris2011-01-108-28/+42
| |\ \
| * | | encrypted-keys: style and other cleanupMimi Zohar2010-12-152-37/+29
| * | | encrypted-keys: verify datablob size before converting to binaryMimi Zohar2010-12-151-14/+15
| * | | trusted-keys: kzalloc and other cleanupMimi Zohar2010-12-151-18/+16
| * | | trusted-keys: additional TSS return code and other error handlingMimi Zohar2010-12-151-62/+87
| * | | Smack: Transmute labels on specified directoriesJarkko Sakkinen2010-12-074-43/+139
| * | | This patch adds a new security attribute to Smack calledCasey Schaufler2010-12-024-54/+176
| * | | keys: add missing include file for trusted and encrypted keysMimi Zohar2010-11-302-0/+2
| * | | Smack: UDS revisionCasey Schaufler2010-11-291-43/+63
| * | | keys: add new key-type encryptedMimi Zohar2010-11-294-0/+980
| * | | keys: add new trusted key-typeMimi Zohar2010-11-294-0/+1301
| * | | security: Define CAP_SYSLOGSerge E. Hallyn2010-11-291-1/+1
| | |/ | |/|
* | | headers: kobject.h reduxAlexey Dobriyan2011-01-101-0/+1
* | | headers: path.h reduxAlexey Dobriyan2011-01-102-3/+1
| |/ |/|
* | Merge branch 'vfs-scale-working' of git://git.kernel.org/pub/scm/linux/kernel...Linus Torvalds2011-01-073-6/+20
|\ \
| * | fs: rcu-walk for path lookupNick Piggin2011-01-071-0/+9
| * | fs: dcache rationalise dget variantsNick Piggin2011-01-071-1/+1
| * | fs: dcache remove dcache_lockNick Piggin2011-01-071-4/+0
| * | fs: dcache scale subdirsNick Piggin2011-01-071-2/+10
| * | fs: dcache scale d_unhashedNick Piggin2011-01-071-0/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6Linus Torvalds2011-01-064-21/+20
|\ \ \ | |/ / |/| |
| * | af_unix: Avoid socket->sk NULL OOPS in stream connect security hooks.David S. Miller2011-01-054-15/+14
| * | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2010-12-266-35/+10
| |\ \
| * | | SELinux: indicate fatal error in compat netfilter codeEric Paris2010-11-231-2/+2
| * | | SELinux: Only return netlink error when we know the return is fatalEric Paris2010-11-231-4/+4
| * | | SELinux: return -ECONNREFUSED from ip_postroute to signal fatal errorEric Paris2010-11-171-8/+8
* | | | ima: fix add LSM rule bugMimi Zohar2011-01-031-0/+2
| |/ / |/| |
* | | KEYS: Don't call up_write() if __key_link_begin() returns an errorDavid Howells2010-12-231-1/+0
| |/ |/|
* | capabilities/syslog: open code cap_syslog logic to fix build failureEric Paris2010-11-155-34/+10
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmo...Linus Torvalds2010-11-122-3/+5
|\
| * APPARMOR: Fix memory leak of apparmor_init()wzt.wzt@gmail.com2010-11-111-2/+4
| * APPARMOR: Fix memory leak of alloc_namespace()wzt.wzt@gmail.com2010-11-111-1/+1
* | Restrict unprivileged access to kernel syslogDan Rosenberg2010-11-122-0/+14
|/
* convert get_sb_single() usersAl Viro2010-10-293-16/+13
* Fix install_process_keyring error handlingAndi Kleen2010-10-281-1/+1
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2010-10-264-4/+2
|\
| * fs: take dcache_lock inside __d_pathChristoph Hellwig2010-10-252-4/+0
OpenPOWER on IntegriCloud