[GIT PULL] apparmor fix for 4.15-rc8

[John Johansen]

Linus,

can you please pull the following regression fixes for apparmor.

It 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.

thanks
-- John


The following changes since commit c92a9a461dff6140c539c61e457aa97df29517d6:

  Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (2018-01-12 10:32:11 -0800)

are available in the git repository at:

  git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor tags/apparmor-pr-2018-01-12

for you to fetch changes up to 1a3881d305592d947ed47887306919d50112394d:

  apparmor: Fix regression in profile conflict logic (2018-01-12 15:56:50 -0800)

----------------------------------------------------------------
- apparmor: fix ptrace label match when matching stacked labels
- apparmor: Fix regression in profile conflict logic

----------------------------------------------------------------
John Johansen (1):
      apparmor: fix ptrace label match when matching stacked labels

Matthew Garrett (1):
      apparmor: Fix regression in profile conflict logic

 security/apparmor/domain.c        |  9 ++++---
 security/apparmor/include/perms.h |  3 +++
 security/apparmor/ipc.c           | 53 +++++++++++++++++++++++----------------
 3 files changed, 40 insertions(+), 25 deletions(-)

Attachment: signature.asc
Description: OpenPGP digital signature