aboutsummaryrefslogtreecommitdiffstats
path: root/fs/exec.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/exec.c')
-rw-r--r--fs/exec.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 639177b0eeac..998e856c3079 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1045,7 +1045,7 @@ void install_exec_creds(struct linux_binprm *bprm)
1045 commit_creds(bprm->cred); 1045 commit_creds(bprm->cred);
1046 bprm->cred = NULL; 1046 bprm->cred = NULL;
1047 1047
1048 /* cred_exec_mutex must be held at least to this point to prevent 1048 /* cred_guard_mutex must be held at least to this point to prevent
1049 * ptrace_attach() from altering our determination of the task's 1049 * ptrace_attach() from altering our determination of the task's
1050 * credentials; any time after this it may be unlocked */ 1050 * credentials; any time after this it may be unlocked */
1051 1051
@@ -1055,7 +1055,7 @@ EXPORT_SYMBOL(install_exec_creds);
1055 1055
1056/* 1056/*
1057 * determine how safe it is to execute the proposed program 1057 * determine how safe it is to execute the proposed program
1058 * - the caller must hold current->cred_exec_mutex to protect against 1058 * - the caller must hold current->cred_guard_mutex to protect against
1059 * PTRACE_ATTACH 1059 * PTRACE_ATTACH
1060 */ 1060 */
1061int check_unsafe_exec(struct linux_binprm *bprm) 1061int check_unsafe_exec(struct linux_binprm *bprm)
@@ -1297,7 +1297,7 @@ int do_execve(char * filename,
1297 if (!bprm) 1297 if (!bprm)
1298 goto out_files; 1298 goto out_files;
1299 1299
1300 retval = mutex_lock_interruptible(&current->cred_exec_mutex); 1300 retval = mutex_lock_interruptible(&current->cred_guard_mutex);
1301 if (retval < 0) 1301 if (retval < 0)
1302 goto out_free; 1302 goto out_free;
1303 current->in_execve = 1; 1303 current->in_execve = 1;
@@ -1360,7 +1360,7 @@ int do_execve(char * filename,
1360 /* execve succeeded */ 1360 /* execve succeeded */
1361 current->fs->in_exec = 0; 1361 current->fs->in_exec = 0;
1362 current->in_execve = 0; 1362 current->in_execve = 0;
1363 mutex_unlock(&current->cred_exec_mutex); 1363 mutex_unlock(&current->cred_guard_mutex);
1364 acct_update_integrals(current); 1364 acct_update_integrals(current);
1365 free_bprm(bprm); 1365 free_bprm(bprm);
1366 if (displaced) 1366 if (displaced)
@@ -1383,7 +1383,7 @@ out_unmark:
1383 1383
1384out_unlock: 1384out_unlock:
1385 current->in_execve = 0; 1385 current->in_execve = 0;
1386 mutex_unlock(&current->cred_exec_mutex); 1386 mutex_unlock(&current->cred_guard_mutex);
1387 1387
1388out_free: 1388out_free:
1389 free_bprm(bprm); 1389 free_bprm(bprm);