Revert "cred: add missing return error code when set_cred_ucounts() failed"
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Sep 2021 14:06:40 +0000 (16:06 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 8 Sep 2021 06:48:59 +0000 (08:48 +0200)
This reverts commit 0855952ed4f1a6861fbb0e5d684efd447d7347c9 which is
commit 5e6b8a50a7cec5686ee2c4bda1d49899c79a7eae upstream.

The "original" commit 905ae01c4ae2 ("Add a reference to ucounts for each
cred"), should not have been applied to the 5.10.y tree, so revert it,
and the follow-on fixup patches as well.

Reported-by: "Eric W. Biederman" <ebiederm@xmission.com>
Link: https://lore.kernel.org/r/87v93k4bl6.fsf@disp2133
Cc: Yang Yingliang <yangyingliang@huawei.com>
Cc: Alexey Gladkov <legion@kernel.org>
Cc: Sasha Levin <sashal@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kernel/cred.c

index 098213d4a39c3de3636fa1e0cef0ba82484e14f1..58a8a9e24347d4202a96a412e17ce2288db5c273 100644 (file)
@@ -372,8 +372,7 @@ int copy_creds(struct task_struct *p, unsigned long clone_flags)
                ret = create_user_ns(new);
                if (ret < 0)
                        goto error_put;
-               ret = set_cred_ucounts(new);
-               if (ret < 0)
+               if (set_cred_ucounts(new) < 0)
                        goto error_put;
        }