From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 19 Jun 2019 18:39:00 +0000 (-0700)
Subject: Merge tag 'apparmor-pr-2019-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.2-rc6~27
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=c3c0d546d73ad53c85789154872b8c92d1f96ba1;p=users%2Fwilly%2Flinux.git

Merge tag 'apparmor-pr-2019-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Pull apparmor bug fixes from John Johansen:

 - fix PROFILE_MEDIATES for untrusted input

 - enforce nullbyte at end of tag string

 - reset pos on failure to unpack for various functions

* tag 'apparmor-pr-2019-06-18' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: reset pos on failure to unpack for various functions
  apparmor: enforce nullbyte at end of tag string
  apparmor: fix PROFILE_MEDIATES for untrusted input
---

c3c0d546d73ad53c85789154872b8c92d1f96ba1