Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd9d43f4 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Linus Torvalds
Browse files

fs/exec.c: do_execve_common(): use current_user() 



Trivial cleanup.  do_execve_common() can use current_user() and avoid the
unnecessary "struct cred *cred" var.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Cc: Vasiliy Kulikov <segoon@openwall.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 18c830df

fs/exec.c

+1 −2
Original line number Diff line number Diff line
@@ -1464,7 +1464,6 @@ static int do_execve_common(const char *filename, 
	struct files_struct *displaced;

	bool clear_in_exec;

	int retval;

	const struct cred *cred = current_cred();



	/*

	 * We move the actual failure in case of RLIMIT_NPROC excess from
@@ -1473,7 +1472,7 @@ static int do_execve_common(const char *filename, 
	 * whether NPROC limit is still exceeded.

	 */

	if ((current->flags & PF_NPROC_EXCEEDED) &&

	    atomic_read(&cred->user->processes) > rlimit(RLIMIT_NPROC)) {

	    atomic_read(&current_user()->processes) > rlimit(RLIMIT_NPROC)) {

		retval = -EAGAIN;

		goto out_ret;

	}