diff options
| author | David Howells <dhowells@redhat.com> | 2011-04-28 16:26:38 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-05-03 10:10:51 +1000 |
| commit | 3a852d3bd53e718206a18b015909c4b575952692 (patch) | |
| tree | 86a6f7a6a96f4b333cd65d883320a565b39b11a8 /fs/binfmt_flat.c | |
| parent | db5ca356d8af8e43832c185ceec90850ff2ebb45 (diff) | |
| download | lwn-3a852d3bd53e718206a18b015909c4b575952692.tar.gz lwn-3a852d3bd53e718206a18b015909c4b575952692.zip | |
CRED: Fix load_flat_shared_library() to initialise bprm correctly
Fix binfmt_flag's load_flat_shared_library() to initialise bprm correctly.
Currently, prepare_binprm() is called with only .filename .file and .cred
fields set in bprm, but the .cred_prepared and .per_clear fields at least need
initialising.
Reported-by: Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/binfmt_flat.c')
| -rw-r--r-- | fs/binfmt_flat.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/fs/binfmt_flat.c b/fs/binfmt_flat.c index 397d3057d336..1bffbe0ed778 100644 --- a/fs/binfmt_flat.c +++ b/fs/binfmt_flat.c @@ -820,6 +820,8 @@ static int load_flat_shared_library(int id, struct lib_info *libs) int res; char buf[16]; + memset(&bprm, 0, sizeof(bprm)); + /* Create the file name */ sprintf(buf, "/lib/lib%d.so", id); @@ -835,6 +837,12 @@ static int load_flat_shared_library(int id, struct lib_info *libs) if (!bprm.cred) goto out; + /* We don't really care about recalculating credentials at this point + * as we're past the point of no return and are dealing with shared + * libraries. + */ + bprm.cred_prepared = 1; + res = prepare_binprm(&bprm); if (!IS_ERR_VALUE(res)) |