Skip to content

Commit c6b39f0

Browse files
sherllyjrjohansen
authored andcommitted
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: 5ac8c35 ("apparmor: allow introspecting the loaded policy pre internal transform") Signed-off-by: Xiyu Yang <[email protected]> Signed-off-by: Xin Tan <[email protected]> Signed-off-by: John Johansen <[email protected]>
1 parent a0b845f commit c6b39f0

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

security/apparmor/apparmorfs.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -454,14 +454,15 @@ static ssize_t policy_update(u32 mask, const char __user *buf, size_t size,
454454
*/
455455
error = aa_may_manage_policy(label, ns, mask);
456456
if (error)
457-
return error;
457+
goto end_section;
458458

459459
data = aa_simple_write_to_buffer(buf, size, size, pos);
460460
error = PTR_ERR(data);
461461
if (!IS_ERR(data)) {
462462
error = aa_replace_profiles(ns, label, mask, data);
463463
aa_put_loaddata(data);
464464
}
465+
end_section:
465466
end_current_label_crit_section(label);
466467

467468
return error;

0 commit comments

Comments
 (0)