Commit 62add982 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace 

Pull ucount fixes from Eric Biederman:
 "This branch fixes a regression that made it impossible to increase
  rlimits that had been converted to the ucount infrastructure, and also
  fixes a reference counting bug where the reference was not incremented
  soon enough.

  The fixes are trivial and the bugs have been encountered in the wild,
  and the fixes have been tested"

* 'for-v5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace:
  ucounts: Increase ucounts reference counter before the security hook
  ucounts: Fix regression preventing increasing of rlimits in init_user_ns
parents 6e764bcd bbb6d0f3

kernel/cred.c

+6 −6
Original line number Diff line number Diff line
@@ -286,13 +286,13 @@ struct cred *prepare_creds(void) 
	new->security = NULL;

#endif



	if (security_prepare_creds(new, old, GFP_KERNEL_ACCOUNT) < 0)

		goto error;



	new->ucounts = get_ucounts(new->ucounts);

	if (!new->ucounts)

		goto error;



	if (security_prepare_creds(new, old, GFP_KERNEL_ACCOUNT) < 0)

		goto error;



	validate_creds(new);

	return new;
@@ -753,13 +753,13 @@ struct cred *prepare_kernel_cred(struct task_struct *daemon) 
#ifdef CONFIG_SECURITY

	new->security = NULL;

#endif

	if (security_prepare_creds(new, old, GFP_KERNEL_ACCOUNT) < 0)

		goto error;



	new->ucounts = get_ucounts(new->ucounts);

	if (!new->ucounts)

		goto error;



	if (security_prepare_creds(new, old, GFP_KERNEL_ACCOUNT) < 0)

		goto error;



	put_cred(old);

	validate_creds(new);

	return new;

kernel/fork.c

+4 −4
Original line number Diff line number Diff line
@@ -828,10 +828,10 @@ void __init fork_init(void) 
	for (i = 0; i < MAX_PER_NAMESPACE_UCOUNTS; i++)

		init_user_ns.ucount_max[i] = max_threads/2;



	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_NPROC, task_rlimit(&init_task, RLIMIT_NPROC));

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_MSGQUEUE, task_rlimit(&init_task, RLIMIT_MSGQUEUE));

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_SIGPENDING, task_rlimit(&init_task, RLIMIT_SIGPENDING));

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_MEMLOCK, task_rlimit(&init_task, RLIMIT_MEMLOCK));

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_NPROC,      RLIM_INFINITY);

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_MSGQUEUE,   RLIM_INFINITY);

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_SIGPENDING, RLIM_INFINITY);

	set_rlimit_ucount_max(&init_user_ns, UCOUNT_RLIMIT_MEMLOCK,    RLIM_INFINITY);



#ifdef CONFIG_VMAP_STACK

	cpuhp_setup_state(CPUHP_BP_PREPARE_DYN, "fork:vm_stack_cache",