nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

daemon: Ensure proper alignment on the stack. 

* nix/libstore/build.cc (startBuilder): When calling 'clone', increase
the step to 16 and ensure it aligns properly on the stack.
This commit is contained in:
Efraim Flashner 2017-02-14 21:48:30 +02:00
parent 3b254d7613
commit ab4ccc8fcf
No known key found for this signature in database
GPG Key ID: F4C1D3917EACEE93
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
nix/libstore/build.cc
View File

@ -26,6 +26,7 @@
#include <errno.h> #include <errno.h>
#include <stdio.h> #include <stdio.h>
#include <cstring> #include <cstring>
#include <stdint.h>
#include <pwd.h> #include <pwd.h>
#include <grp.h> #include <grp.h>
@ -2008,7 +2009,11 @@ void DerivationGoal::startBuilder()
char stack[32 * 1024]; char stack[32 * 1024];
int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD; int flags = CLONE_NEWPID | CLONE_NEWNS | CLONE_NEWIPC | CLONE_NEWUTS | SIGCHLD;
if (!fixedOutput) flags |= CLONE_NEWNET; if (!fixedOutput) flags |= CLONE_NEWNET;
pid = clone(childEntry, stack + sizeof(stack) - 8, flags, this);
/* Ensure proper alignment on the stack. On aarch64, it has to be 16
bytes. */
pid = clone(childEntry, (char *)(((uintptr_t)stack + 16) & ~0xf),
flags, this);
if (pid == -1) if (pid == -1)
throw SysError("cloning builder process"); throw SysError("cloning builder process");
} else } else