diff options
| author | Efraim Flashner <efraim@flashner.co.il> | 2017-02-14 21:48:30 +0200 |
|---|---|---|
| committer | Efraim Flashner <efraim@flashner.co.il> | 2017-02-20 13:09:03 +0200 |
| commit | ab4ccc8fcfaf2215d4b33b1376147e4c2c70426a (patch) | |
| tree | 1d3634adf7b2e84d1f1963f52f89f4b1eb0aff55 /nix/libstore | |
| parent | 3b254d76132627ff62ac5571f4175669164624c5 (diff) | |
| download | guix-ab4ccc8fcfaf2215d4b33b1376147e4c2c70426a.tar.gz | |
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.
Diffstat (limited to 'nix/libstore')
| -rw-r--r-- | nix/libstore/build.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/nix/libstore/build.cc b/nix/libstore/build.cc index cebc404d1c..9b7bb5391c 100644 --- a/nix/libstore/build.cc +++ b/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,7 +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; - 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) throw SysError("cloning builder process"); } else |