diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 21:52:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-06 21:52:55 -0500 |
| commit | ccfef64621ef1e8c7726581b38eb8b98fd2a8afb (patch) | |
| tree | 74d99dcecbd7adad1dcd5d61fac408855b43a267 /fs/compat.c | |
| parent | ae1a25da8448271a99745da03100d5299575a269 (diff) | |
| parent | 0bf2f3aec5474da80a60e1baca629af87ecb67b6 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
CRED: Fix SUID exec regression
Diffstat (limited to 'fs/compat.c')
| -rw-r--r-- | fs/compat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/compat.c b/fs/compat.c index 65a070e705ab..d0145ca27572 100644 --- a/fs/compat.c +++ b/fs/compat.c | |||
| @@ -1407,7 +1407,7 @@ int compat_do_execve(char * filename, | |||
| 1407 | bprm->cred = prepare_exec_creds(); | 1407 | bprm->cred = prepare_exec_creds(); |
| 1408 | if (!bprm->cred) | 1408 | if (!bprm->cred) |
| 1409 | goto out_unlock; | 1409 | goto out_unlock; |
| 1410 | check_unsafe_exec(bprm); | 1410 | check_unsafe_exec(bprm, current->files); |
| 1411 | 1411 | ||
| 1412 | file = open_exec(filename); | 1412 | file = open_exec(filename); |
| 1413 | retval = PTR_ERR(file); | 1413 | retval = PTR_ERR(file); |