Browse Source

daemon: Ensure the child stack is aligned on a 16-byte boundary.

* nix/libstore/build.cc (DerivationGoal::startBuilder): When calling 'clone',
ensure that the stack is aligned on a 16-byte boundary.
python-updates
Mark H Weaver 5 years ago
parent
commit
a1aa5dabaa
No known key found for this signature in database GPG Key ID: 7CEF29847562C516
  1. 11
      nix/libstore/build.cc

11
nix/libstore/build.cc

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

Loading…
Cancel
Save