]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit447a64a6b77ed36a11e270f5d1c2bd0d249dcb0c
tree5c8de2d138cd172138ab19c204884366960a6f55
parent06842741aa2109190d2744f2c40ba90eaf498cd8
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: 35de281abe39 ("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