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 ad4f28c2327a..e639957d7a57 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1025,7 +1025,7 @@ void install_exec_creds(struct linux_binprm *bprm)
1025 commit_creds(bprm->cred); 1025 commit_creds(bprm->cred);
1026 bprm->cred = NULL; 1026 bprm->cred = NULL;
1027 1027
1028 /* cred_exec_mutex must be held at least to this point to prevent 1028 /* cred_guard_mutex must be held at least to this point to prevent
1029 * ptrace_attach() from altering our determination of the task's 1029 * ptrace_attach() from altering our determination of the task's
1030 * credentials; any time after this it may be unlocked */ 1030 * credentials; any time after this it may be unlocked */
1031 1031
@@ -1035,7 +1035,7 @@ EXPORT_SYMBOL(install_exec_creds);
1035 1035
1036/* 1036/*
1037 * determine how safe it is to execute the proposed program 1037 * determine how safe it is to execute the proposed program
1038 * - the caller must hold current->cred_exec_mutex to protect against 1038 * - the caller must hold current->cred_guard_mutex to protect against
1039 * PTRACE_ATTACH 1039 * PTRACE_ATTACH
1040 */ 1040 */
1041int check_unsafe_exec(struct linux_binprm *bprm) 1041int check_unsafe_exec(struct linux_binprm *bprm)
@@ -1277,7 +1277,7 @@ int do_execve(char * filename,
1277 if (!bprm) 1277 if (!bprm)
1278 goto out_files; 1278 goto out_files;
1279 1279
1280 retval = mutex_lock_interruptible(&current->cred_exec_mutex); 1280 retval = mutex_lock_interruptible(&current->cred_guard_mutex);
1281 if (retval < 0) 1281 if (retval < 0)
1282 goto out_free; 1282 goto out_free;
1283 current->in_execve = 1; 1283 current->in_execve = 1;
@@ -1340,7 +1340,7 @@ int do_execve(char * filename,
1340 /* execve succeeded */ 1340 /* execve succeeded */
1341 current->fs->in_exec = 0; 1341 current->fs->in_exec = 0;
1342 current->in_execve = 0; 1342 current->in_execve = 0;
1343 mutex_unlock(&current->cred_exec_mutex); 1343 mutex_unlock(&current->cred_guard_mutex);
1344 acct_update_integrals(current); 1344 acct_update_integrals(current);
1345 free_bprm(bprm); 1345 free_bprm(bprm);
1346 if (displaced) 1346 if (displaced)
@@ -1363,7 +1363,7 @@ out_unmark:
1363 1363
1364out_unlock: 1364out_unlock:
1365 current->in_execve = 0; 1365 current->in_execve = 0;
1366 mutex_unlock(&current->cred_exec_mutex); 1366 mutex_unlock(&current->cred_guard_mutex);
1367 1367
1368out_free: 1368out_free:
1369 free_bprm(bprm); 1369 free_bprm(bprm);