summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cg...Linus Torvalds2012-01-091-3/+4
|\
| * cgroup: introduce cgroup_taskset and use it in subsys->can_attach(), cancel_a...Tejun Heo2011-12-121-3/+4
* | Merge branch 'for-linus2' of git://git.kernel.org/pub/scm/linux/kernel/git/vi...Linus Torvalds2012-01-0813-60/+46
|\ \
| * | switch security_path_chmod() to struct path *Al Viro2012-01-064-17/+11
| * | vfs: prefer ->dentry->d_sb to ->mnt->mnt_sbAl Viro2012-01-062-3/+3
| | |
| | \
| *-. \ Merge branches 'vfsmount-guts', 'umode_t' and 'partitions' into ZAl Viro2012-01-0610-34/+34
| |\ \ \
| | * | | switch ->path_mknod() to umode_tAl Viro2012-01-034-4/+4
| | * | | switch ->path_mkdir() to umode_tAl Viro2012-01-034-4/+4
| | * | | tomoyo_mini_stat: switch to umode_tAl Viro2012-01-032-3/+3
| | * | | switch securityfs_create_file() to umode_tAl Viro2012-01-033-8/+8
| | * | | switch security_path_chmod() to umode_tAl Viro2012-01-034-4/+4
| | * | | get rid of open-coded S_ISREG(), etc.Al Viro2012-01-032-2/+2
| | * | | switch ->mknod() to umode_tAl Viro2012-01-033-3/+3
| | * | | switch ->create() to umode_tAl Viro2012-01-033-3/+3
| | * | | switch vfs_mkdir() and ->mkdir() to umode_tAl Viro2012-01-033-3/+3
| | |/ /
| * / / vfs: trim includes a bitAl Viro2012-01-031-0/+1
| |/ /
| * | vfs: for usbfs, etc. internal vfsmounts ->mnt_sb->s_root == ->mnt_rootAl Viro2012-01-031-1/+1
| * | btrfs, nfs, apparmor: don't pull mnt_namespace.h for no reason...Al Viro2012-01-031-1/+0
| * | tomoyo: stop including hell knows whatAl Viro2012-01-031-8/+0
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-01-041-1/+1
|\| |
| * | security: Fix security_old_inode_init_security() when CONFIG_SECURITY is not setJan Kara2012-01-031-1/+1
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2011-12-234-35/+66
|\| |
| * | SELinux: Fix RCU deref check warning in sel_netport_insert()David Howells2011-12-211-1/+3
| * | evm: prevent racing during tfm allocationDmitry Kasatkin2011-12-201-0/+9
| * | evm: key must be set once during initializationDmitry Kasatkin2011-12-201-4/+6
| * | TOMOYO: Fix pathname handling of disconnected paths.Tetsuo Handa2011-12-081-1/+9
| * | fix apparmor dereferencing potentially freed dentry, sanitize __d_path() APIAl Viro2011-12-062-29/+39
| |/
* | inet_diag: Partly rename inet_ to sock_Pavel Emelyanov2011-12-061-1/+1
* | ipv6: Add fragment reporting to ipv6_skip_exthdr().Jesse Gross2011-12-032-2/+4
* | net: remove ipv6_addr_copy()Alexey Dobriyan2011-11-223-6/+6
|/
* Merge branch 'encrypted-key-fixes' of git://git.kernel.org/pub/scm/linux/kern...James Morris2011-11-183-4/+9
|\
| * encrypted-keys: module build fixesMimi Zohar2011-11-162-3/+8
| * encrypted-keys: fix error return codeMimi Zohar2011-11-161-1/+1
* | Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linusJames Morris2011-11-181-76/+39
|\ \ | |/ |/|
| * Smack: smackfs cipso seq read repairCasey Schaufler2011-11-111-76/+39
* | KEYS: Fix a NULL pointer deref in the user-defined key typeDavid Howells2011-11-151-1/+2
* | Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2011-11-062-0/+2
|\ \
| * | selinux: Add export.h to files using EXPORT_SYMBOL/THIS_MODULEPaul Gortmaker2011-10-312-0/+2
* | | Merge branch 'for-linus' of git://git.selinuxproject.org/~jmorris/linux-securityLinus Torvalds2011-11-021-0/+30
|\ \ \
| * | | TOMOYO: Fix interactive judgment functionality.Tetsuo Handa2011-10-291-0/+30
* | | | Merge branch 'for-linus' of git://github.com/richardweinberger/linuxLinus Torvalds2011-11-021-1/+1
|\ \ \ \
| * | | | um: switch to use of drivers/KconfigAl Viro2011-11-021-1/+1
* | | | | security: follow rename pack_hex_byte() to hex_byte_pack()Andy Shevchenko2011-10-312-2/+2
* | | | | Cross Memory AttachChristopher Yeoh2011-10-312-2/+2
| |_|/ / |/| | |
* | | | Merge branch 'next' of git://selinuxproject.org/~jmorris/linux-securityLinus Torvalds2011-10-2572-1201/+4164
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge branch 'master' of git://gitorious.org/smack-next/kernel into nextJames Morris2011-10-223-24/+51
| |\|
| | * Smack: allow to access /smack/access as normal userJarkko Sakkinen2011-10-203-23/+50
| | * Smack: fix: invalid length set for the result of /smack/accessJarkko Sakkinen2011-10-181-1/+1
| * | TOMOYO: Fix incomplete read after seek.Tetsuo Handa2011-10-221-0/+1
| * | TOMOYO: Fix unused kernel config option.Tetsuo Handa2011-10-191-2/+4
| |/