]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commit
projects / mirror_ubuntu-zesty-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 21d2744) | patch
UBUNTU: SAUCE: apparmor: Fix: insert race between label_update and label_merge
authorJohn Johansen <john.johansen@canonical.com>
Wed, 15 Oct 2014 11:04:16 +0000 (04:04 -0700)
committerTim Gardner <tim.gardner@canonical.com>
Wed, 6 Apr 2016 09:21:29 +0000 (10:21 +0100)
commitebc616b9f0521d2617bbfc0af46ce6e891744cb0
tree62adf313b101eb2616025ca39868eb73dbfa05e5tree
parent21d27446672a4fb38534d6c9308c4242b697e102commit | diff
UBUNTU: SAUCE: apparmor: Fix: insert race between label_update and label_merge

BugLink: http://bugs.launchpad.net/bugs/1448912
it is possible for a label_merge to be racing label_update resulting
in the AA_BUG(__aa_label_remove_and_insert()) to trip. Instead check
if a version of label has already been inserted and gracefully fail
if label_update lost the race.

Signed-off-by: John Johansen <john.johansen@canonical.com>
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
security/apparmor/label.c diff | blob | blame | history
ubuntu-zesty-kernel mirror