summaryrefslogtreecommitdiffstats
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-11-132-9/+10
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-10-235-30/+17
| |\
| * | netfilter: pass hook ops to hookfnPatrick McHardy2013-10-141-5/+5
| * | net: fix build errors if ipv6 is disabledEric Dumazet2013-10-091-0/+2
| * | ipv6: make lookups simpler and fasterEric Dumazet2013-10-091-3/+2
| * | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-10-013-20/+21
| |\ \
| * | | net ipv4: Convert ipv4.ip_local_port_range to be per netns v3Eric W. Biederman2013-09-301-1/+1
* | | | Merge branch 'for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2013-11-131-11/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | device_cgroup: remove can_attachSerge Hallyn2013-10-241-11/+0
| |/ /
* | | apparmor: fix bad lock balance when introspecting policyJohn Johansen2013-10-161-3/+1
* | | apparmor: fix memleak of the profile hashJohn Johansen2013-10-161-0/+1
* | | selinux: remove 'flags' parameter from avc_audit()Linus Torvalds2013-10-043-4/+4
* | | selinux: avc_has_perm_flags has no more usersLinus Torvalds2013-10-042-17/+6
* | | selinux: remove 'flags' parameter from inode_has_permLinus Torvalds2013-10-041-7/+6
| |/ |/|
* | apparmor: fix suspicious RCU usage warning in policy.c/policy.hJohn Johansen2013-09-302-2/+5
* | apparmor: Use shash crypto API interface for profile hashesTyler Hicks2013-09-301-18/+16
|/
* Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebi...Linus Torvalds2013-09-071-5/+5
|\
| * capabilities: allow nice if we are privilegedSerge Hallyn2013-08-301-4/+4
| * userns: Allow PR_CAPBSET_DROP in a user namespace.Eric W. Biederman2013-08-301-1/+1
* | Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2013-09-0728-547/+1666
|\ \
| * \ Merge branch 'smack-for-3.12' of git://git.gitorious.org/smack-next/kernel in...James Morris2013-08-234-114/+150
| |\ \
| | * | Smack: parse multiple rules per write to load2, up to PAGE_SIZE-1 bytesRafal Krypa2013-08-121-85/+82
| | * | Smack: network label match fixCasey Schaufler2013-08-013-9/+31
| | * | security: smack: add a hash table to quicken smk_find_entry()Tomasz Stanislawski2013-08-013-9/+37
| | * | security: smack: fix memleak in smk_write_rules_list()Tomasz Stanislawski2013-08-011-22/+11
| | |/
| * | apparmor: add the ability to report a sha1 hash of loaded policyJohn Johansen2013-08-148-6/+199
| * | apparmor: export set of capabilities supported by the apparmor moduleJohn Johansen2013-08-144-1/+15
| * | apparmor: add the profile introspection file to interfaceJohn Johansen2013-08-141-0/+236
| * | apparmor: add an optional profile attachment string for profilesJohn Johansen2013-08-144-0/+40
| * | apparmor: add interface files for profiles and namespacesJohn Johansen2013-08-147-29/+436
| * | apparmor: allow setting any profile into the unconfined stateJohn Johansen2013-08-145-9/+22
| * | apparmor: make free_profile available outside of policy.cJohn Johansen2013-08-143-7/+7
| * | apparmor: rework namespace free pathJohn Johansen2013-08-142-35/+10
| * | apparmor: update how unconfined is handledJohn Johansen2013-08-143-83/+67
| * | apparmor: change how profile replacement update is doneJohn Johansen2013-08-146-87/+125
| * | apparmor: convert profile lists to RCU based lockingJohn Johansen2013-08-144-111/+167
| * | apparmor: provide base for multiple profiles to be replaced at onceJohn Johansen2013-08-144-146/+283
| * | apparmor: add a features/policy dir to interfaceJohn Johansen2013-08-141-0/+5
| * | apparmor: enable users to query whether apparmor is enabledJohn Johansen2013-08-141-1/+1
| * | apparmor: remove minimum size check for vmalloc()Tetsuo Handa2013-08-141-5/+0
| * | xattr: Constify ->name member of "struct xattr".Tetsuo Handa2013-07-255-24/+14
| |/
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-nextLinus Torvalds2013-09-051-1/+6
|\ \
| * \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2013-08-161-13/+11
| |\ \
| * | | net: split rt_genid for ipv4 and ipv6fan.du2013-07-311-1/+6
| | |/ | |/|
* | | Merge tag 'modules-next-for-linus' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2013-09-041-0/+2
|\ \ \
| * | | module/lsm: Have apparmor module parameters work with no argsSteven Rostedt2013-08-201-0/+2
| |/ /
* | | Merge branch 'for-3.12' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/c...Linus Torvalds2013-09-031-39/+26
|\ \ \ | |_|/ |/| |
| * | cgroup: make css_for_each_descendant() and friends include the origin css in ...Tejun Heo2013-08-081-1/+1
| * | cgroup: make hierarchy iterators deal with cgroup_subsys_state instead of cgroupTejun Heo2013-08-081-8/+3
| * | cgroup: pass around cgroup_subsys_state instead of cgroup in file methodsTejun Heo2013-08-081-6/+6