From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2018 20:00:33 +0000 (-0700)
Subject: Merge tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~8113
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57bb8e37d71eac45b6ea9180698a9cc3db945e26;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'apparmor-pr-2018-08-23' of git://git./linux/kernel/git/jj/linux-apparmor

Pull apparmor updates from John Johansen:
 "There is nothing major this time just four bug fixes and a patch to
  remove some dead code:

  Cleanups:
   - remove no-op permission check in policy_unpack

  Bug fixes:
   - fix an error code in __aa_create_ns()
   - fix failure to audit context info in build_change_hat
   - check buffer bounds when mapping permissions mask
   - fully initialize aa_perms struct when answering userspace query"

* tag 'apparmor-pr-2018-08-23' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: remove no-op permission check in policy_unpack
  apparmor: fix an error code in __aa_create_ns()
  apparmor: Fix failure to audit context info in build_change_hat
  apparmor: Fully initialize aa_perms struct when answering userspace query
  apparmor: Check buffer bounds when mapping permissions mask
---

57bb8e37d71eac45b6ea9180698a9cc3db945e26