author: Linus Torvalds <torvalds@linux-foundation.org> 2009-08-06 15:09:34 -0700
committer: Linus Torvalds <torvalds@linux-foundation.org> 2009-08-07 10:39:57 -0700
commit: 3440625d78711bee41a84cf29c3d8c579b522666
parent: 9e5cf0ca2e9b65110ae5f094d7f0f7165cd1bbbb
Commit Summary:
Diffstat:
1 file changed, 10 insertions, 5 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c
index 697f6b5f1313..e92f229e3c6e 100644
--- a/fs/binfmt_flat.c
+++ b/fs/binfmt_flat.c
@@ -828,15 +828,22 @@ static int load_flat_shared_library(int id, struct lib_info *libs)
if (IS_ERR(bprm.file))
return res;
+ bprm.cred = prepare_exec_creds();
+ res = -ENOMEM;
+ if (!bprm.cred)
+ goto out;
+
res = prepare_binprm(&bprm);
if (res <= (unsigned long)-4096)
res = load_flat_file(&bprm, libs, id, NULL);
- if (bprm.file) {
- allow_write_access(bprm.file);
- fput(bprm.file);
- bprm.file = NULL;
- }
+
+ abort_creds(bprm.cred);
+
+out:
+ allow_write_access(bprm.file);
+ fput(bprm.file);
+
return(res);
}