lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'linus' into perfcounters/core

Browse Source 
Merge reason: This brach was on -rc1, refresh it to almost-rc4 to pick up
              the latest upstream fixes.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-04-29 14:46:59 +02:00
parent 1130b02961 56a50adda4
commit e7fd5d4b3d
1883 changed files with 53620 additions and 55294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
fs/exec.c
View File

@@ -1069,7 +1069,6 @@ EXPORT_SYMBOL(install_exec_creds);
int check_unsafe_exec(struct linux_binprm *bprm)
{
struct task_struct *p = current, *t;
unsigned long flags;
unsigned n_fs;
int res = 0;
@@ -1077,21 +1076,22 @@ int check_unsafe_exec(struct linux_binprm *bprm)
n_fs = 1;
write_lock(&p->fs->lock);
lock_task_sighand(p, &flags);
rcu_read_lock();
for (t = next_thread(p); t != p; t = next_thread(t)) {
if (t->fs == p->fs)
n_fs++;
}
rcu_read_unlock();
if (p->fs->users > n_fs) {
bprm->unsafe |= LSM_UNSAFE_SHARE;
} else {
if (p->fs->in_exec)
res = -EAGAIN;
p->fs->in_exec = 1;
res = -EAGAIN;
if (!p->fs->in_exec) {
p->fs->in_exec = 1;
res = 1;
}
}
unlock_task_sighand(p, &flags);
write_unlock(&p->fs->lock);
return res;
@@ -1293,6 +1293,7 @@ int do_execve(char * filename,
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
bool clear_in_exec;
int retval;
retval = unshare_files(&displaced);
@@ -1315,8 +1316,9 @@ int do_execve(char * filename,
goto out_unlock;
retval = check_unsafe_exec(bprm);
if (retval)
if (retval < 0)
goto out_unlock;
clear_in_exec = retval;
file = open_exec(filename);
retval = PTR_ERR(file);
@@ -1364,9 +1366,7 @@ int do_execve(char * filename,
goto out;
/* execve succeeded */
write_lock(&current->fs->lock);
current->fs->in_exec = 0;
write_unlock(&current->fs->lock);
current->in_execve = 0;
mutex_unlock(&current->cred_exec_mutex);
acct_update_integrals(current);
@@ -1386,9 +1386,8 @@ out_file:
}
out_unmark:
write_lock(&current->fs->lock);
current->fs->in_exec = 0;
write_unlock(&current->fs->lock);
if (clear_in_exec)
current->fs->in_exec = 0;
out_unlock:
current->in_execve = 0;