summaryrefslogtreecommitdiffstats
path: root/security/apparmor
Commit message (Expand)AuthorAgeFilesLines
* vfs: do bulk POLL* -> EPOLL* replacementLinus Torvalds2018-02-111-1/+1
* Merge branch 'misc.poll' of git://git.kernel.org/pub/scm/linux/kernel/git/vir...Linus Torvalds2018-01-301-2/+2
|\
| * apparmor: annotate ->poll() instancesAl Viro2017-11-271-2/+2
* | apparmor: Fix regression in profile conflict logicMatthew Garrett2018-01-121-4/+5
* | apparmor: fix ptrace label match when matching stacked labelsJohn Johansen2018-01-122-21/+35
* | apparmor: fix regression in mount mediation when feature set is pinnedJohn Johansen2018-01-051-1/+11
* | Merge tag 'apparmor-pr-2017-11-30' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-11-301-5/+7
|\ \
| * | apparmor: fix oops in audit_signal_cb hookJohn Johansen2017-11-271-5/+7
* | | Rename superblock flags (MS_xyz -> SB_xyz)Linus Torvalds2017-11-272-2/+2
| |/ |/|
* | Merge tag 'apparmor-pr-2017-11-21' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-11-2311-71/+91
|\ \
| * | apparmor: fix possible recursive lock warning in __aa_create_nsJohn Johansen2017-11-215-21/+21
| * | apparmor: fix locking when creating a new complain profile.John Johansen2017-11-211-3/+15
| * | apparmor: fix profile attachment for special unconfined profilesJohn Johansen2017-11-211-1/+3
| * | apparmor: ensure that undecidable profile attachments failJohn Johansen2017-11-211-14/+32
| * | apparmor: fix leak of null profile name if profile allocation failsJohn Johansen2017-11-211-1/+2
| * | apparmor: remove unused redundant variable stopColin Ian King2017-11-211-3/+0
| * | apparmor: Fix bool initialization/comparisonThomas Meyer2017-11-211-4/+4
| * | apparmor: initialized returned struct aa_permsArnd Bergmann2017-11-213-22/+12
| * | apparmor: fix spelling mistake: "resoure" -> "resource"Colin Ian King2017-11-211-2/+2
* | | Merge tag 'modules-for-v4.15' of git://git.kernel.org/pub/scm/linux/kernel/gi...Linus Torvalds2017-11-151-8/+8
|\ \ \
| * | | treewide: Fix function prototypes for module_param_call()Kees Cook2017-10-311-8/+8
* | | | Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2017-11-132-15/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Merge branch 'linus' into locking/core, to resolve conflictsIngo Molnar2017-11-0712-840/+17
| |\ \ \
| * | | | locking/rwsem, security/apparmor: Replace homebrew use of write_can_lock() wi...Will Deacon2017-10-102-15/+4
| | |/ / | |/| |
* | | | apparmor: fix off-by-one comparison on MAXMAPPED_SIGJohn Johansen2017-11-081-2/+2
| |/ / |/| |
* | | Merge tag 'spdx_identifiers-4.14-rc8' of git://git.kernel.org/pub/scm/linux/k...Linus Torvalds2017-11-021-0/+1
|\ \ \ | |_|/ |/| |
| * | License cleanup: add SPDX GPL-2.0 license identifier to files with no licenseGreg Kroah-Hartman2017-11-021-0/+1
| |/
* | Revert "apparmor: add base infastructure for socket mediation"Linus Torvalds2017-10-2612-840/+16
|/
* Merge tag 'apparmor-pr-2017-09-22' of git://git.kernel.org/pub/scm/linux/kern...Linus Torvalds2017-09-2324-137/+2088
|\
| * apparmor: fix apparmorfs DAC access permissionsJohn Johansen2017-09-221-4/+4
| * apparmor: fix build failure on sparc caused by undeclared signalsJohn Johansen2017-09-221-1/+4
| * apparmor: fix incorrect type assignment when freeing proxiesJohn Johansen2017-09-221-1/+1
| * apparmor: ensure unconfined profiles have dfas initializedJohn Johansen2017-09-221-0/+2
| * apparmor: fix race condition in null profile creationJohn Johansen2017-09-221-3/+11
| * apparmor: move new_null_profile to after profile lookup fns()John Johansen2017-09-221-79/+79
| * apparmor: add base infastructure for socket mediationJohn Johansen2017-09-2212-16/+840
| * apparmor: add more debug asserts to apparmorfsJohn Johansen2017-09-221-0/+17
| * apparmor: make policy_unpack able to audit different info messagesJohn Johansen2017-09-222-16/+40
| * apparmor: add support for absolute root view based labelsJohn Johansen2017-09-222-1/+10
| * apparmor: cleanup conditional check for label in label_printJohn Johansen2017-09-221-14/+8
| * apparmor: add mount mediationJohn Johansen2017-09-229-4/+841
| * apparmor: add the ability to mediate signalsJohn Johansen2017-09-227-0/+231
| * apparmor: Redundant condition: prev_ns. in [label.c:1498]John Johansen2017-09-221-1/+1
| * apparmor: Fix an error code in aafs_create()Dan Carpenter2017-09-221-1/+3
| * apparmor: Fix logical error in verify_header()Christos Gkekas2017-09-221-1/+1
| * apparmor: Fix shadowed local variable in unpack_trans_table()Geert Uytterhoeven2017-09-221-2/+2
* | apparmor: Refactor to remove bprm_secureexec hookKees Cook2017-08-014-23/+1
* | exec: Rename bprm->cred_prepared to called_set_credsKees Cook2017-08-011-1/+1
|/
* Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/...Linus Torvalds2017-07-0534-1786/+7136
|\
| * apparmor: put back designators in struct initialisersStephen Rothwell2017-06-281-2/+2
OpenPOWER on IntegriCloud