From 75d810db6d08e638f00329568d0c30c225d09f82 Mon Sep 17 00:00:00 2001
From: Hugh Dickins <hugh@veritas.com>
Date: Sat, 28 Mar 2009 23:16:03 +0000
Subject: [PATCH] --- yaml --- r: 137579 b: refs/heads/master c:
 53e9309e01277ec99c38e84e0ca16921287cf470 h: refs/heads/master i:   137577:
 d0228e3f3013171dd093804d59c060dd24d4ef5f   137575:
 79a9de947609a2bfc569a6131160f20c54aa37dc v: v3

---
 [refs]            |  2 +-
 trunk/fs/compat.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 546b44b6ef02..6e308dc0d547 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 07d43ba98621f08e252a48c96b258b4d572b0257
+refs/heads/master: 53e9309e01277ec99c38e84e0ca16921287cf470
diff --git a/trunk/fs/compat.c b/trunk/fs/compat.c
index 5e374aad33f7..b543363dd625 100644
--- a/trunk/fs/compat.c
+++ b/trunk/fs/compat.c
@@ -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)
@@ -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:
@@ -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;
 }