pasta, util: Align stack area for clones to maximum natural alignment
Given that we use this stack pointer as a location to store arbitrary data types from the cloned process, we need to guarantee that its alignment matches any of those possible data types. runsisi reports that pasta gets a SIGBUS in pasta_open_ns() on aarch64, where the alignment requirement for stack pointers is a 16 bytes (same as the size of a long double), and similar requirements actually apply to most architectures we run on. Reported-by: runsisi <runsisi@hust.edu.cn> Link: https://bugs.passt.top/show_bug.cgi?id=85 Signed-off-by: Stefano Brivio <sbrivio@redhat.com> Reviewed-by: David Gibson <david@gibson.dropbear.id.au>
This commit is contained in:
4
util.h
4
util.h
@@ -9,6 +9,7 @@
|
||||
#include <stdlib.h>
|
||||
#include <stdarg.h>
|
||||
#include <stdbool.h>
|
||||
#include <stddef.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
|
||||
@@ -116,7 +117,8 @@ int do_clone(int (*fn)(void *), char *stack_area, size_t stack_size, int flags,
|
||||
void *arg);
|
||||
#define NS_CALL(fn, arg) \
|
||||
do { \
|
||||
char ns_fn_stack[NS_FN_STACK_SIZE]; \
|
||||
char ns_fn_stack[NS_FN_STACK_SIZE] \
|
||||
__attribute__ ((aligned(__alignof__(max_align_t)))); \
|
||||
\
|
||||
do_clone((fn), ns_fn_stack, sizeof(ns_fn_stack), \
|
||||
CLONE_VM | CLONE_VFORK | CLONE_FILES | SIGCHLD,\
|
||||
|
Reference in New Issue
Block a user