]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
UBUNTU: SAUCE: apparmor: Fix: label merge handling of marking unconfined and stale
authorJohn Johansen <john.johansen@canonical.com>
Thu, 24 Sep 2015 12:22:24 +0000 (05:22 -0700)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 6 Apr 2016 09:21:31 +0000 (10:21 +0100)
commit0f4e3979540db68192cd6731bfb4431f6ade6a0e
treede9f7dedb7cc8df3e4dfc2c8c02478700d3f8d9a
parentd2d90f2f28b8de077325fe7ba19f65b406e66135
UBUNTU: SAUCE: apparmor: Fix: label merge handling of marking unconfined and stale

BugLink: http://bugs.launchpad.net/bugs/1448912
Fix a couple of bugs in label merge.
- the unconfined status may not be correctly set in the case of a stale
  profile
- if merge(A,B) == A' where A' is revised none stale version of A then
  the insertion of A' to replace A can fail.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
security/apparmor/label.c