summaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-12-10 14:40:21 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2008-12-10 14:40:21 -0800
commitf4fd2c5b6f691ff71614acbc28461b3c1488c81b (patch)
tree7f0141d303ba548bfa221f178e580f68e84303de /fs
parent711a49a07f84f914aac26a52143f6e7526571143 (diff)
parent85f334666a771680472722eee43ae0fc8730a619 (diff)
downloadlinux-3.10-f4fd2c5b6f691ff71614acbc28461b3c1488c81b.tar.gz
linux-3.10-f4fd2c5b6f691ff71614acbc28461b3c1488c81b.tar.bz2
linux-3.10-f4fd2c5b6f691ff71614acbc28461b3c1488c81b.zip
Merge branch 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland
* 'to-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland: tracehook: exec double-reporting fix
Diffstat (limited to 'fs')
-rw-r--r--fs/exec.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/fs/exec.c b/fs/exec.c
index 4e834f16d9d..ec5df9a3831 100644
--- a/fs/exec.c
+++ b/fs/exec.c
@@ -1159,6 +1159,7 @@ EXPORT_SYMBOL(remove_arg_zero);
*/
int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
{
+ unsigned int depth = bprm->recursion_depth;
int try,retval;
struct linux_binfmt *fmt;
#ifdef __alpha__
@@ -1219,8 +1220,15 @@ int search_binary_handler(struct linux_binprm *bprm,struct pt_regs *regs)
continue;
read_unlock(&binfmt_lock);
retval = fn(bprm, regs);
+ /*
+ * Restore the depth counter to its starting value
+ * in this call, so we don't have to rely on every
+ * load_binary function to restore it on return.
+ */
+ bprm->recursion_depth = depth;
if (retval >= 0) {
- tracehook_report_exec(fmt, bprm, regs);
+ if (depth == 0)
+ tracehook_report_exec(fmt, bprm, regs);
put_binfmt(fmt);
allow_write_access(bprm->file);
if (bprm->file)