From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 5 Jan 2020 03:28:30 +0000 (-0800)
Subject: Merge tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~4802
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a125bcda2d0aee1d98b51c167aca60fb312572aa;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'apparmor-pr-2020-01-04' of git://git./linux/kernel/git/jj/linux-apparmor

Pull apparmor fixes from John Johansen:

 - performance regression: only get a label reference if the fast path
   check fails

 - fix aa_xattrs_match() may sleep while holding a RCU lock

 - fix bind mounts aborting with -ENOMEM

* tag 'apparmor-pr-2020-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix aa_xattrs_match() may sleep while holding a RCU lock
  apparmor: only get a label reference if the fast path check fails
  apparmor: fix bind mounts aborting with -ENOMEM
---

a125bcda2d0aee1d98b51c167aca60fb312572aa