aboutsummaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2016-05-10 03:26:02 -0500
committerRob Landley <rob@landley.net>2016-05-10 03:26:02 -0500
commit4e756d7f9fd1b32b545ce8c43120dc733653b52f (patch)
treeaecf1b7276aab2e8a6589a7e56bc71e7c73b6bb1 /main.c
parent869da8ce3752ce6f5aa63d302eebe60a2b5c8da8 (diff)
downloadtoybox-4e756d7f9fd1b32b545ce8c43120dc733653b52f.tar.gz
Use CFG_TOYBOX_NORECURSE to avoid
<strike>all that tedious mucking about with hyperspace</strike> stack measuring in ways that confuse security stuff.
Diffstat (limited to 'main.c')
-rw-r--r--main.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/main.c b/main.c
index 14c4ff71..eeae2f39 100644
--- a/main.c
+++ b/main.c
@@ -140,7 +140,8 @@ void toy_exec(char *argv[])
// Compiler writers have decided subtracting char * is undefined behavior,
// so convert to integers. (LP64 says sizeof(long)==sizeof(pointer).)
- if (toys.stacktop && labs((long)toys.stacktop-(long)&which)>6000) return;
+ if (!CFG_TOYBOX_NORECURSE)
+ if (toys.stacktop && labs((long)toys.stacktop-(long)&which)>6000) return;
// Return if we need to re-exec to acquire root via suid bit.
if (toys.which && (which->flags&TOYFLAG_ROOTONLY) && toys.wasroot) return;