Skip to content

Commit

Permalink
apparmor: fix a memleak in multi_transaction_new()
Browse files Browse the repository at this point in the history
[ Upstream commit c73275c ]

In multi_transaction_new(), the variable t is not freed or passed out
on the failure of copy_from_user(t->data, buf, size), which could lead
to a memleak.

Fix this bug by adding a put_multi_transaction(t) in the error path.

Fixes: 1dea3b4 ("apparmor: speed up transactional queries")
Signed-off-by: Gaosheng Cui <[email protected]>
Signed-off-by: John Johansen <[email protected]>
Signed-off-by: Sasha Levin <[email protected]>
  • Loading branch information
gscui authored and gregkh committed Jan 18, 2023
1 parent df12101 commit eb0f78e
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion security/apparmor/apparmorfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -869,8 +869,10 @@ static struct multi_transaction *multi_transaction_new(struct file *file,
if (!t)
return ERR_PTR(-ENOMEM);
kref_init(&t->count);
if (copy_from_user(t->data, buf, size))
if (copy_from_user(t->data, buf, size)) {
put_multi_transaction(t);
return ERR_PTR(-EFAULT);
}

return t;
}
Expand Down

0 comments on commit eb0f78e

Please sign in to comment.