diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-20 21:53:31 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-11-28 21:53:38 -0500 |
commit | 3c456bfc4ba66e9cda210da7bc4fb0ba9fcc6972 (patch) | |
tree | 486f15c6415f5c13ad141d0fbe125495b4400252 /fs/exec.c | |
parent | 835ab32dff6b437e74c266468b83c4abb69041dc (diff) |
get rid of pt_regs argument of search_binary_handler()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/exec.c')
-rw-r--r-- | fs/exec.c | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -1349,7 +1349,7 @@ EXPORT_SYMBOL(remove_arg_zero); | |||
1349 | /* | 1349 | /* |
1350 | * cycle the list of binary formats handler, until one recognizes the image | 1350 | * cycle the list of binary formats handler, until one recognizes the image |
1351 | */ | 1351 | */ |
1352 | int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | 1352 | int search_binary_handler(struct linux_binprm *bprm) |
1353 | { | 1353 | { |
1354 | unsigned int depth = bprm->recursion_depth; | 1354 | unsigned int depth = bprm->recursion_depth; |
1355 | int try,retval; | 1355 | int try,retval; |
@@ -1380,7 +1380,7 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs) | |||
1380 | if (!try_module_get(fmt->module)) | 1380 | if (!try_module_get(fmt->module)) |
1381 | continue; | 1381 | continue; |
1382 | read_unlock(&binfmt_lock); | 1382 | read_unlock(&binfmt_lock); |
1383 | retval = fn(bprm, regs); | 1383 | retval = fn(bprm, current_pt_regs()); |
1384 | /* | 1384 | /* |
1385 | * Restore the depth counter to its starting value | 1385 | * Restore the depth counter to its starting value |
1386 | * in this call, so we don't have to rely on every | 1386 | * in this call, so we don't have to rely on every |
@@ -1447,7 +1447,6 @@ static int do_execve_common(const char *filename, | |||
1447 | bool clear_in_exec; | 1447 | bool clear_in_exec; |
1448 | int retval; | 1448 | int retval; |
1449 | const struct cred *cred = current_cred(); | 1449 | const struct cred *cred = current_cred(); |
1450 | struct pt_regs *regs = current_pt_regs(); | ||
1451 | 1450 | ||
1452 | /* | 1451 | /* |
1453 | * We move the actual failure in case of RLIMIT_NPROC excess from | 1452 | * We move the actual failure in case of RLIMIT_NPROC excess from |
@@ -1524,7 +1523,7 @@ static int do_execve_common(const char *filename, | |||
1524 | if (retval < 0) | 1523 | if (retval < 0) |
1525 | goto out; | 1524 | goto out; |
1526 | 1525 | ||
1527 | retval = search_binary_handler(bprm,regs); | 1526 | retval = search_binary_handler(bprm); |
1528 | if (retval < 0) | 1527 | if (retval < 0) |
1529 | goto out; | 1528 | goto out; |
1530 | 1529 | ||