Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 137579
b: refs/heads/master
c: 53e9309
h: refs/heads/master
i:
  137577: d0228e3
  137575: 79a9de9
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed Mar 29, 2009
1 parent 679e3d7 commit 75d810d
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 07d43ba98621f08e252a48c96b258b4d572b0257
refs/heads/master: 53e9309e01277ec99c38e84e0ca16921287cf470
12 changes: 11 additions & 1 deletion trunk/fs/compat.c
Original file line number Diff line number Diff line change
Expand Up @@ -1420,12 +1420,17 @@ int compat_do_execve(char * filename,
{
struct linux_binprm *bprm;
struct file *file;
struct files_struct *displaced;
int retval;

retval = unshare_files(&displaced);
if (retval)
goto out_ret;

retval = -ENOMEM;
bprm = kzalloc(sizeof(*bprm), GFP_KERNEL);
if (!bprm)
goto out_ret;
goto out_files;

retval = mutex_lock_interruptible(&current->cred_exec_mutex);
if (retval < 0)
Expand Down Expand Up @@ -1487,6 +1492,8 @@ int compat_do_execve(char * filename,
mutex_unlock(&current->cred_exec_mutex);
acct_update_integrals(current);
free_bprm(bprm);
if (displaced)
put_files_struct(displaced);
return retval;

out:
Expand All @@ -1506,6 +1513,9 @@ int compat_do_execve(char * filename,
out_free:
free_bprm(bprm);

out_files:
if (displaced)
reset_files_struct(displaced);
out_ret:
return retval;
}
Expand Down

0 comments on commit 75d810d

Please sign in to comment.