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

Commit 6f423d7a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "android: binder: Enable preemption for security_binder_transfer_file" into msm-4.9

parents 0dc0724b cc2dec9c

drivers/android/binder.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -1765,7 +1765,9 @@ static int binder_translate_fd(int fd, 
		ret = -EBADF;

		ret = -EBADF;

		goto err_fget;

		goto err_fget;

	}

	}

	preempt_enable_no_resched();

	ret = security_binder_transfer_file(proc->tsk, target_proc->tsk, file);

	ret = security_binder_transfer_file(proc->tsk, target_proc->tsk, file);

	preempt_disable();

	if (ret < 0) {

	if (ret < 0) {

		ret = -EPERM;

		ret = -EPERM;

		goto err_security;

		goto err_security;