Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Xiyu Yang and committed by
John Johansen
c6b39f07 a0b845ff

+2 -1
+2 -1
security/apparmor/apparmorfs.c
··· 454 454 */ 455 455 error = aa_may_manage_policy(label, ns, mask); 456 456 if (error) 457 - return error; 457 + goto end_section; 458 458 459 459 data = aa_simple_write_to_buffer(buf, size, size, pos); 460 460 error = PTR_ERR(data); ··· 462 462 error = aa_replace_profiles(ns, label, mask, data); 463 463 aa_put_loaddata(data); 464 464 } 465 + end_section: 465 466 end_current_label_crit_section(label); 466 467 467 468 return error;