Merge "Android: binder: check set_context_mgr permission on time." into android-chromeos-dragon-3.18
diff --git a/drivers/staging/android/binder.c b/drivers/staging/android/binder.c
index c7415b4..bb136ca 100644
--- a/drivers/staging/android/binder.c
+++ b/drivers/staging/android/binder.c
@@ -2785,6 +2785,9 @@
ret = -EBUSY;
goto out;
}
+ ret = security_binder_set_context_mgr(proc->tsk);
+ if (ret < 0)
+ goto out;
if (uid_valid(binder_context_mgr_uid)) {
if (!uid_eq(binder_context_mgr_uid, curr_euid)) {
pr_err("BINDER_SET_CONTEXT_MGR bad uid %d != %d\n",
@@ -2850,9 +2853,6 @@
ret = binder_ioctl_set_ctx_mgr(filp);
if (ret)
goto err;
- ret = security_binder_set_context_mgr(proc->tsk);
- if (ret < 0)
- goto err;
break;
case BINDER_THREAD_EXIT:
binder_debug(BINDER_DEBUG_THREADS, "%d:%d exit\n",
