summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm-current/current'Stephen Rothwell2018-05-302-0/+2
|\
| * prctl: add PR_[GS]ET_PDEATHSIG_PROCJürg Billeter2018-05-262-0/+2
* | Merge remote-tracking branch 'userns/for-next'Stephen Rothwell2018-05-302-3/+8
|\ \
| * | capabilities: Allow privileged user in s_user_ns to set security.* xattrsEric W. Biederman2018-05-241-2/+6
| * | evm: Don't update hmacs in user ns mountsSeth Forshee2018-05-031-1/+2
* | | Merge remote-tracking branch 'audit/next'Stephen Rothwell2018-05-306-14/+17
|\ \ \
| * | | audit: use inline function to get audit contextRichard Guy Briggs2018-05-146-14/+17
* | | | Merge remote-tracking branch 'selinux/next'Stephen Rothwell2018-05-301-6/+12
|\ \ \ \
| * | | | audit: normalize MAC_POLICY_LOAD recordRichard Guy Briggs2018-04-171-1/+1
| * | | | audit: normalize MAC_STATUS recordRichard Guy Briggs2018-04-171-4/+10
| * | | | security: selinux: Change return type to vm_fault_tSouptick Joarder2018-04-161-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'apparmor/apparmor-next'Stephen Rothwell2018-05-3013-66/+370
|\ \ \ \
| * | | | apparmor: Fix memory leak of rule on error exit pathTyler Hicks2018-05-171-2/+4
| * | | | apparmor: modify audit rule support to support profile stacksJohn Johansen2018-05-141-17/+10
| * | | | apparmor: Add support for audit rule filteringMatthew Garrett2018-05-143-1/+107
| * | | | apparmor: Convert to use match_string() helperAndy Shevchenko2018-05-081-14/+10
| * | | | apparmor: improve get_buffers macro by using get_cpu_ptrJohn Johansen2018-05-081-17/+15
| * | | | apparmor: fix '*seclen' is never less than zeroJohn Johansen2018-05-081-9/+11
| * | | | apparmor: fix typo "preconfinement"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: fix typo "independent"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: fix typo "traverse"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: fix typo "type"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: fix typo "replace"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: fix typo "comparison"Zygmunt Krynicki2018-05-031-3/+3
| * | | | apparmor: fix typo "loosen"Zygmunt Krynicki2018-05-031-1/+1
| * | | | apparmor: add the ability to get a task's secidJohn Johansen2018-05-021-0/+8
| * | | | apparmor: add support for mapping secids and using secctxesJohn Johansen2018-05-026-25/+224
| | |/ / | |/| |
* | | | Merge remote-tracking branch 'security/next-testing'Stephen Rothwell2018-05-3018-84/+414
|\ \ \ \
| * | | | ima: fix updating the ima_appraise flagMimi Zohar2018-05-221-9/+19
| * | | | ima: based on policy verify firmware signatures (pre-allocated buffer)Mimi Zohar2018-05-221-0/+1
| * | | | ima: define a new policy condition based on the filesystem nameMimi Zohar2018-05-221-1/+24
| * | | | EVM: Allow runtime modification of the set of verified xattrsMatthew Garrett2018-05-184-4/+188
| * | | | EVM: turn evm_config_xattrnames into a listMatthew Garrett2018-05-183-39/+57
| * | | | integrity: Add an integrity directory in securityfsMatthew Garrett2018-05-174-4/+52
| * | | | ima: Remove unused variable ima_initializedPetr Vorel2018-05-172-6/+2
| * | | | ima: Unify loggingPetr Vorel2018-05-173-2/+9
| * | | | ima: Reflect correct permissions for policyPetr Vorel2018-05-171-0/+2
| * | | | dh key: get rid of stack allocated array for zeroesTycho Andersen2018-05-111-3/+3
| * | | | dh key: get rid of stack allocated arrayTycho Andersen2018-05-111-19/+10
| * | | | big key: get rid of stack array allocationTycho Andersen2018-05-111-1/+10
| * | | | smack: provide socketpair callbackTom Gundersen2018-05-041-0/+22
| * | | | selinux: provide socketpair callbackDavid Herrmann2018-05-041-0/+13
| * | | | security: add hook for socketpair()David Herrmann2018-05-041-0/+6
| |/ / /
* | | | Merge remote-tracking branch 'net-next/master'Stephen Rothwell2018-05-302-2/+6
|\ \ \ \
| * \ \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-05-261-4/+16
| |\ \ \ \ | | | |_|/ | | |/| |
| * | | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2018-05-211-22/+28
| |\ \ \ \
| * | | | | net: initial AF_XDP skeletonBjörn Töpel2018-05-032-2/+6
| | |_|/ / | |/| | |
* | | | | Merge remote-tracking branch 'vfs/for-next'Stephen Rothwell2018-05-302-36/+5
|\ \ \ \ \ | |_|_|/ / |/| | | |
| | | | |
| | \ \ \
| | \ \ \
| | \ \ \
| *---. \ \ \ Merge branches 'work.dcache', 'work.misc', 'hch.aio' and 'hch.procfs' into fo...Al Viro2018-05-263-40/+23
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| | | | * | | proc: introduce proc_create_seq{,_data}Christoph Hellwig2018-05-161-32/+2
| | | | |/ /