diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 13:18:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-01-13 13:18:15 -0800 |
| commit | 852b0a89026fd810fce7163922fb79620c3a8628 (patch) | |
| tree | 51f95bba8713364b89a0ec12d8b329c43c43ad22 /Makefile | |
| parent | 8e66791a80abd0e86ac1995395129791eefe50b5 (diff) | |
| parent | 1a3881d305592d947ed47887306919d50112394d (diff) | |
| download | op-kernel-dev-852b0a89026fd810fce7163922fb79620c3a8628.zip op-kernel-dev-852b0a89026fd810fce7163922fb79620c3a8628.tar.gz | |
Merge tag 'apparmor-pr-2018-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor
Pull apparmor regression fixes from John Johansen:
"This fixes a couple bugs I have been working with Matthew Garrett on
this week. Specifically a regression in the handling of a conflicting
profile attachment and label match restrictions for ptrace when
profiles are stacked.
Summary:
- fix ptrace label match when matching stacked labels
- fix regression in profile conflict logic"
* tag 'apparmor-pr-2018-01-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
apparmor: Fix regression in profile conflict logic
apparmor: fix ptrace label match when matching stacked labels
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions
