Skip to content

Commit 5fc9e37

Browse files
committed
ucounts: Remove unnecessary test for NULL ucount in get_ucounts
All of the callers of get_ucounts are passeds a non-NULL value so stop handling a NULL ucounts pointer in get_ucounts. It is guaranteed that ever valid fully formed cred that is passed to commit_cred contains a non-NULL ucounts pointer. This in turn gurantees that current_ucounts() never returns NULL. The call of get_ucounts in user_shm_lock is always passed current_ucounts(). The call of get_ucounts in mqueue_get_inode is always passed current_ucounts(). The call of get_ucounts in inc_rlmit_get_ucounts is always passed iter, after iter has been verified to be non-NULL. The call of get_ucounts in key_change_session_keyring is always passed current_ucounts(). The call of get_ucounts in prepare_cred is always passed current_ucounts(). The call of get_ucounts in prepare_kernel_cred is always passed task->cred->ucounts or init_cred->ucounts which being on tasks are guaranteed to have a non-NULL ucounts field. Link: https://lkml.kernel.org/r/87v91uqksg.fsf_-_@disp2133 Tested-by: Yu Zhao <[email protected]> Reviewed-by: Alexey Gladkov <[email protected]> Signed-off-by: "Eric W. Biederman" <[email protected]>
1 parent 99c31f9 commit 5fc9e37

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/ucount.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static void hlist_add_ucounts(struct ucounts *ucounts)
152152

153153
struct ucounts *get_ucounts(struct ucounts *ucounts)
154154
{
155-
if (ucounts && atomic_add_negative(1, &ucounts->count)) {
155+
if (atomic_add_negative(1, &ucounts->count)) {
156156
put_ucounts(ucounts);
157157
ucounts = NULL;
158158
}

0 commit comments

Comments
 (0)