]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge tag 'apparmor-pr-2019-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Mar 2019 18:07:36 +0000 (11:07 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 13 Mar 2019 18:07:36 +0000 (11:07 -0700)
commit8636b1dbce854363cd98922b3e4b49a603c4d5fd
tree5e5ea62866a58d613842a488db56e792b6fad33b
parent5453a3df2a5eb49bc24615d4cf0d66b2aae05e5f
parentd8dbb581d4f86a2ac669c056fc71a28ebeb367f4
Merge tag 'apparmor-pr-2019-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor

Pull apparmor fixes from John Johansen:

 - fix double when failing to unpack secmark rules in policy

 - fix leak of dentry when profile is removed

* tag 'apparmor-pr-2019-03-12' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor:
  apparmor: fix double free when unpack of secmark rules fails
  apparmor: delete the dentry in aafs_remove() to avoid a leak
  apparmor: Fix warning about unused function apparmor_ipv6_postroute
security/apparmor/apparmorfs.c