summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge tag 'apparmor-pr-2018-04-10' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2018-04-1433-525/+2119
|\
| * apparmor: fix memory leak on buffer on error exit pathColin Ian King2018-03-311-1/+3
| * apparmor: fix dangling symlinks to policy rawdata after replacementJohn Johansen2018-03-241-31/+95
| * apparmor: Fix an error code in verify_table_headers()Dan Carpenter2018-03-241-1/+1
| * apparmor: fix error returns checks by making size a ssize_tColin Ian King2018-03-241-1/+1
| * apparmor: update MAINTAINERS file git and wiki locationsJohn Johansen2018-03-141-2/+2
| * apparmor: remove POLICY_MEDIATES_SAFEJohn Johansen2018-03-142-12/+2
| * apparmor: add base infastructure for socket mediationJohn Johansen2018-03-1413-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
| * apparmor: update domain transitions that are subsets of confinement at nnpJohn Johansen2018-02-094-65/+110
| * apparmor: move context.h to cred.hJohn Johansen2018-02-0915-14/+14
| * apparmor: move task related defines and fns to task.X filesJohn Johansen2018-02-096-98/+105
| * apparmor: cleanup, drop unused fn __aa_task_is_confined()John Johansen2018-02-091-11/+0
| * apparmor: cleanup fixup description of aa_replace_profilesJohn Johansen2018-02-091-2/+3
| * apparmor: rename tctx to ctxJohn Johansen2018-02-093-30/+29
| * apparmor: drop cred_ctx and reference the label directlyJohn Johansen2018-02-094-129/+47
| * apparmor: move task domain change info to task securityJohn Johansen2018-02-094-52/+132
| * apparmor: rename task_ctx to the more accurate cred_ctxJohn Johansen2018-02-095-46/+45
| * apparmor: audit unknown signal numbersJohn Johansen2018-02-093-4/+12
| * apparmor: make signal label match work when matching stacked labelsJohn Johansen2018-02-091-28/+12
| * security: apparmor: remove duplicate includesPravin Shedge2018-02-091-1/+0
| * apparmor: root view labels should not be under user controlJohn Johansen2018-02-091-3/+2
| * apparmor: cleanup add proper line wrapping to nulldfa.inJohn Johansen2018-02-091-1/+107
| * apparmor: provide a bounded version of label_parseJohn Johansen2018-02-092-11/+27
| * apparmor: use the dfa to do label parse string splittingJohn Johansen2018-02-095-11/+170
| * apparmor: add first substr match to dfaJohn Johansen2018-02-092-0/+124
| * apparmor: split load data into management struct and data blobJohn Johansen2018-02-092-4/+11
| * apparmor: fix logging of the existence test for signalsJohn Johansen2018-02-092-2/+4
| * apparmor: fix resource audit messages when auditing peerJohn Johansen2018-02-091-4/+4
| * apparmor: fix display of .ns_name for containersJohn Johansen2018-02-091-3/+1
* | Merge tag 'for-linus-20180413' of git://git.kernel.dk/linux-blockLinus Torvalds2018-04-1419-226/+245
|\ \
| * | nvme: expand nvmf_check_if_ready checksJames Smart2018-04-127-66/+101
| * | nvme: Use admin command effects for admin commandsKeith Busch2018-04-121-1/+1
| * | nvmet: fix space padding in serial numberDaniel Verkamp2018-04-121-0/+1
| * | nvme: check return value of init_srcu_struct functionMax Gurtovoy2018-04-121-1/+4
| * | nvmet: Fix nvmet_execute_write_zeroes sector countRodrigo R. Galvao2018-04-121-2/+2
| * | nvme-pci: Separate IO and admin queue IRQ vectorsKeith Busch2018-04-121-6/+17
| * | nvme-pci: Remove unused queue parameterKeith Busch2018-04-121-7/+3
| * | nvme-pci: Skip queue deletion if there are no queuesKeith Busch2018-04-121-1/+1
| * | nvme: target: fix buffer overflowArnd Bergmann2018-04-121-1/+1
| * | nvme: don't send keep-alives to the discovery controllerJohannes Thumshirn2018-04-121-1/+3
| * | nvme: unexport nvme_start_keep_aliveJohannes Thumshirn2018-04-122-3/+1
| * | nvme-loop: fix kernel oops in case of unhandled commandMing Lei2018-04-121-7/+2