summaryrefslogtreecommitdiff
path: root/security
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'akpm-current/current'Stephen Rothwell2018-05-142-0/+2
|\
| * prctl: add PR_[GS]ET_PDEATHSIG_PROCJürg Billeter2018-05-122-0/+2
* | Merge remote-tracking branch 'selinux/next'Stephen Rothwell2018-05-141-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 'integrity/next-integrity'Stephen Rothwell2018-05-143-2/+11
|\ \ \
| * | | ima: Unify loggingPetr Vorel2018-05-073-2/+9
| * | | ima: Reflect correct permissions for policyPetr Vorel2018-05-071-0/+2
* | | | Merge remote-tracking branch 'apparmor/apparmor-next'Stephen Rothwell2018-05-1411-65/+268
|\ \ \ \
| * | | | 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-145-23/+64
|\ \ \ \
| * | | | 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-142-2/+6
|\ \ \
| * | | net: initial AF_XDP skeletonBjörn Töpel2018-05-032-2/+6
| |/ /
* | | Merge remote-tracking branch 'vfs-fixes/fixes'Stephen Rothwell2018-05-141-4/+16
|\ \ \ | |/ / |/| |
| * | fix breakage caused by d_find_alias() semantics changeAl Viro2018-05-131-4/+16
| |/
* | Merge branch 'userns-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/...Linus Torvalds2018-04-241-0/+2
|\ \ | |/ |/|
| * commoncap: Handle memory allocation failure.Tetsuo Handa2018-04-101-0/+2
* | Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-04-1332-523/+2117
|\ \
| * | apparmor: fix memory leak on buffer on error exit pathColin Ian King2018-03-301-1/+3
| * | apparmor: fix dangling symlinks to policy rawdata after replacementJohn Johansen2018-03-231-31/+95
| * | apparmor: Fix an error code in verify_table_headers()Dan Carpenter2018-03-231-1/+1
| * | apparmor: fix error returns checks by making size a ssize_tColin Ian King2018-03-231-1/+1
| * | apparmor: remove POLICY_MEDIATES_SAFEJohn Johansen2018-03-132-12/+2
| * | apparmor: add base infastructure for socket mediationJohn Johansen2018-03-1313-8/+786
| * | apparmor: improve overlapping domain attachment resolutionJohn Johansen2018-02-094-14/+158
| * | apparmor: convert attaching profiles via xattrs to use dfa matchingJohn Johansen2018-02-095-57/+43
| * | apparmor: Add support for attaching profiles via xattr, presence and valueMatthew Garrett2018-02-094-34/+217
| * | apparmor: cleanup: simplify code to get ns symlink nameJohn Johansen2018-02-091-19/+6
| * | apparmor: cleanup create_aafs() error pathJohn Johansen2018-02-091-20/+12
| * | apparmor: dfa split verification of table headersJohn Johansen2018-02-091-48/+68
| * | apparmor: dfa add support for state differential encodingJohn Johansen2018-02-092-1/+29
| * | apparmor: dfa move character match into a macroJohn Johansen2018-02-091-47/+27