audit: move put_tree() to avoid trim_trees refcount underflow and UAF
authorRichard Guy Briggs <rgb@redhat.com>
Tue, 24 Aug 2021 02:04:09 +0000 (22:04 -0400)
committerPaul Moore <paul@paul-moore.com>
Tue, 24 Aug 2021 22:52:36 +0000 (18:52 -0400)
commit67d69e9d1a6c889d98951c1d74b19332ce0565af
tree9dc62b09fe7c96ec05736b532959b26959d07b75
parentd97e99386ad0dcae08cb0f0c70efa806a2d4811c
audit: move put_tree() to avoid trim_trees refcount underflow and UAF

AUDIT_TRIM is expected to be idempotent, but multiple executions resulted
in a refcount underflow and use-after-free.

git bisect fingered commit fb041bb7c0a9 ("locking/refcount: Consolidate
implementations of refcount_t") but this patch with its more thorough
checking that wasn't in the x86 assembly code merely exposed a previously
existing tree refcount imbalance in the case of tree trimming code that
was refactored with prune_one() to remove a tree introduced in
commit 8432c7006297 ("audit: Simplify locking around untag_chunk()")

Move the put_tree() to cover only the prune_one() case.

Passes audit-testsuite and 3 passes of "auditctl -t" with at least one
directory watch.

Cc: Jan Kara <jack@suse.cz>
Cc: Will Deacon <will@kernel.org>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Cc: Seiji Nishikawa <snishika@redhat.com>
Cc: stable@vger.kernel.org
Fixes: 8432c7006297 ("audit: Simplify locking around untag_chunk()")
Signed-off-by: Richard Guy Briggs <rgb@redhat.com>
Reviewed-by: Jan Kara <jack@suse.cz>
[PM: reformatted/cleaned-up the commit description]
Signed-off-by: Paul Moore <paul@paul-moore.com>
kernel/audit_tree.c