apparmor: Fix aa_label refcnt leak in policy_update
authorXiyu Yang <xiyuyang19@fudan.edu.cn>
Mon, 20 Apr 2020 05:35:28 +0000 (13:35 +0800)
committerJohn Johansen <john.johansen@canonical.com>
Thu, 21 May 2020 22:25:51 +0000 (15:25 -0700)
commitc6b39f070722ea9963ffe756bfe94e89218c5e63
tree5c8de2d138cd172138ab19c204884366960a6f55
parenta0b845ffa0d91855532b50fc040aeb2d8338dca4
apparmor: Fix aa_label refcnt leak in policy_update

policy_update() invokes begin_current_label_crit_section(), which
returns a reference of the updated aa_label object to "label" with
increased refcount.

When policy_update() returns, "label" becomes invalid, so the refcount
should be decreased to keep refcount balanced.

The reference counting issue happens in one exception handling path of
policy_update(). When aa_may_manage_policy() returns not NULL, the
refcnt increased by begin_current_label_crit_section() is not decreased,
causing a refcnt leak.

Fix this issue by jumping to "end_section" label when
aa_may_manage_policy() returns not NULL.

Fixes: 5ac8c355ae00 ("apparmor: allow introspecting the loaded policy pre internal transform")
Signed-off-by: Xiyu Yang <xiyuyang19@fudan.edu.cn>
Signed-off-by: Xin Tan <tanxin.ctf@gmail.com>
Signed-off-by: John Johansen <john.johansen@canonical.com>
security/apparmor/apparmorfs.c