Skip to content

Commit

Permalink
ucounts: Proper error handling in set_cred_ucounts
Browse files Browse the repository at this point in the history
Instead of leaking the ucounts in new if alloc_ucounts fails, store
the result of alloc_ucounts into a temporary variable, which is later
assigned to new->ucounts.

Cc: stable@vger.kernel.org
Fixes: 905ae01 ("Add a reference to ucounts for each cred")
Link: https://lkml.kernel.org/r/87pms2s0v8.fsf_-_@disp2133
Tested-by: Yu Zhao <yuzhao@google.com>
Reviewed-by: Alexey Gladkov <legion@kernel.org>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
  • Loading branch information
Eric W. Biederman committed Oct 19, 2021
1 parent 629715a commit 34dc2fd
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions kernel/cred.c
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,7 @@ int set_cred_ucounts(struct cred *new)
{
struct task_struct *task = current;
const struct cred *old = task->real_cred;
struct ucounts *old_ucounts = new->ucounts;
struct ucounts *new_ucounts, *old_ucounts = new->ucounts;

if (new->user == old->user && new->user_ns == old->user_ns)
return 0;
Expand All @@ -681,9 +681,10 @@ int set_cred_ucounts(struct cred *new)
if (old_ucounts && old_ucounts->ns == new->user_ns && uid_eq(old_ucounts->uid, new->euid))
return 0;

if (!(new->ucounts = alloc_ucounts(new->user_ns, new->euid)))
if (!(new_ucounts = alloc_ucounts(new->user_ns, new->euid)))
return -EAGAIN;

new->ucounts = new_ucounts;
if (old_ucounts)
put_ucounts(old_ucounts);

Expand Down

0 comments on commit 34dc2fd

Please sign in to comment.