diff options
| author | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-15 02:12:00 -0500 |
| commit | 5e30589521518bff36fd2638b3c3d69679c50436 (patch) | |
| tree | 6ac985658a06b0787e4354d0d16d380ea9b16a5a /fs/compat.c | |
| parent | ac178ef0ae9eb44fd527d87aa9b6394e05f56e1f (diff) | |
| parent | d2f8d7ee1a9b4650b4e43325b321801264f7c37a (diff) | |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Conflicts:
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
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); |