summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm' (patches from Andrew)Linus Torvalds2015-04-151-0/+1
|\
| * kernel: conditionally support non-root users, groups and capabilitiesIulia Manda2015-04-151-0/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2015-04-1516-115/+324
|\ \ | |/ |/|
| * lsm: copy comm before calling audit_log to avoid race in string printingRichard Guy Briggs2015-04-151-6/+9
| * Merge branch 'tomoyo-cleanup' of git://git.kernel.org/pub/scm/linux/kernel/gi...James Morris2015-04-134-45/+15
| |\
| | * tomoyo: Do not generate empty policy filesMichal Marek2015-04-073-29/+5
| | * tomoyo: Use if_changed when generating builtin-policy.hMichal Marek2015-04-071-18/+11
| | * tomoyo: Use bin2c to generate builtin-policy.hMichal Marek2015-04-072-10/+11
| * | selinux: increase avtab max bucketsStephen Smalley2015-04-061-1/+1
| * | selinux: Use a better hash function for avtabJohn Brooks2015-04-062-5/+38
| * | selinux: convert avtab hash table to flex_arrayStephen Smalley2015-04-062-13/+22
| * | selinux: reconcile security_netlbl_secattr_to_sid() and mls_import_netlbl_cat()Paul Moore2015-04-062-12/+4
| * | selinux: remove unnecessary pointer reassignmentJeff Vander Stoep2015-04-061-4/+2
| * | smack: Fix gcc warning from unused smack_syslog_lock mutex in smackfs.cPaul Gortmaker2015-03-231-1/+0
| * | Smack: Allow an unconfined label in bringup modeCasey Schaufler2015-03-234-17/+182
| * | Smack: getting the Smack security context of keysJosé Bollo2015-03-231-0/+31
| * | Smack: Assign smack_known_web as default smk_in label for kernel thread's socketMarcin Lis2015-03-231-1/+15
| * | Merge tag 'yama-4.0' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/li...James Morris2015-03-032-10/+5
| |\ \ | | |/ | |/|
| | * security/yama: Remove unnecessary selects from Kconfig.Stephen Smalley2015-02-271-2/+0
| | * Yama: do not modify global sysctl table entryKees Cook2015-02-271-8/+5
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2015-04-155-43/+24
|\ \ \
| * | | selinux/nlmsg: add a build time check for rtnl/xfrm cmdsNicolas Dichtel2015-04-131-0/+3
| * | | selinux/nlmsg: add XFRM_MSG_MAPPINGNicolas Dichtel2015-04-121-0/+1
| * | | selinux/nlmsg: add XFRM_MSG_MIGRATENicolas Dichtel2015-04-121-0/+1
| * | | selinux/nlmsg: add XFRM_MSG_REPORTNicolas Dichtel2015-04-121-0/+1
| * | | selinux/nlmsg: add XFRM_MSG_[NEW|GET]SADINFONicolas Dichtel2015-04-081-0/+2
| * | | selinux/nlmsg: add XFRM_MSG_GETSPDINFONicolas Dichtel2015-04-081-0/+1
| * | | selinux/nlmsg: add XFRM_MSG_NEWSPDINFONicolas Dichtel2015-04-081-0/+1
| * | | selinux/nlmsg: add RTM_GETNSIDNicolas Dichtel2015-04-081-0/+1
| * | | selinux/nlmsg: add RTM_NEWNSID and RTM_GETNSIDNicolas Dichtel2015-04-081-0/+2
| * | | netfilter: Make nf_hookfn use nf_hook_state.David S. Miller2015-04-042-25/+11
| * | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2015-04-021-1/+1
| |\ \ \
| * | | | Revert "selinux: add a skb_owned_by() hook"Eric Dumazet2015-03-203-18/+0
| | |/ / | |/| |
* | | | Merge branch 'for-linus-1' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-04-1412-106/+64
|\ \ \ \ | |_|/ / |/| | |
| * | | switch keyctl_instantiate_key_common() to iov_iterAl Viro2015-04-113-72/+40
| * | | switch security_inode_getattr() to struct path *Al Viro2015-04-118-30/+20
| * | | constify tomoyo_realpath_from_path()Al Viro2015-04-112-4/+4
| |/ /
* | | Merge branch 'upstream' of git://git.infradead.org/users/pcmoore/selinux into...James Morris2015-03-271-1/+1
|\ \ \ | |/ / |/| |
| * | selinux: fix sel_write_enforce broken return valueJoe Perches2015-03-251-1/+1
| |/
* | Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/v...Linus Torvalds2015-02-227-23/+21
|\ \
| * | VFS: (Scripted) Convert S_ISLNK/DIR/REG(dentry->d_inode) to d_is_*(dentry)David Howells2015-02-222-3/+3
| * | SELinux: Use d_is_positive() rather than testing dentry->d_inodeDavid Howells2015-02-221-2/+2
| * | Smack: Use d_is_positive() rather than testing dentry->d_inodeDavid Howells2015-02-221-2/+2
| * | TOMOYO: Use d_is_dir() rather than d_inode and S_ISDIR()David Howells2015-02-221-3/+1
| * | Apparmor: Use d_is_positive/negative() rather than testing dentry->d_inodeDavid Howells2015-02-221-1/+1
| * | Apparmor: mediated_filesystem() should use dentry->d_sb not inode->i_sbDavid Howells2015-02-222-12/+12
* | | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare...Linus Torvalds2015-02-192-3/+3
|\ \ \ | |/ / |/| |
| * | kconfig: use bool instead of boolean for type definition attributesChristoph Jaeger2015-01-072-3/+3
* | | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2015-02-172-54/+4
|\ \ \
| * | | file->f_path.dentry is pinned down for as long as the file is open...Al Viro2015-01-251-5/+1