From patchwork Mon May 24 18:47:58 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 43558 X-Patchwork-Delegate: carlos@redhat.com Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5DD0A38930C7; Mon, 24 May 2021 18:48:05 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5DD0A38930C7 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1621882085; bh=vPTyq6F6sUESp36DLzNECGxnUaZ6F0snakgXrMI2GlM=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=vEel2DYLy8fxhpJMa7gF9yiI0qu7j0SPDTWKsU05RBWH61r5pj9m33JLlvRuYVZx1 vDNhGPpIMGJ2+wNwUSVFBPu/fcRaaZrfMlD5SaE+jr87XkdM5SwMzWa+kQZ69IRu1r c0eecJv0MV/NEldbvZVmHdZbmL8E7Q2zcni+DDHE= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-pf1-x436.google.com (mail-pf1-x436.google.com [IPv6:2607:f8b0:4864:20::436]) by sourceware.org (Postfix) with ESMTPS id CAABF3857C48 for ; Mon, 24 May 2021 18:48:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org CAABF3857C48 Received: by mail-pf1-x436.google.com with SMTP id d16so21557586pfn.12 for ; Mon, 24 May 2021 11:48:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=vPTyq6F6sUESp36DLzNECGxnUaZ6F0snakgXrMI2GlM=; b=tOhXoFQpTEP9Gfk5BpyEoURAXuhVHX/yX9q+fwfwkFvJmm7PCdHGg6zYg3ScVxTyZK xoBLFqWYp35f+DfCgKUFflvvLTGhxFeY9rhs7CeOry/2VxTdcsHgl7TmDVRlSwhiqjHQ Ii1HeQkx1jmBZnYPMlJ5hgOm+Q0+OEYbX+XnLpKjYN0iCqXUMTD4EE2A0AjgKgDayw0E R2jErn2GhSFYPsqXPgHJP4NUD5fNXzzavstk3wRQUoaV56TJOn6BdlQl9b7B0RLkc/Lx HL7OJo9AAkq+sFxwzRjVYoGNJEP81HYM2BZxoqg79VwtLX1uWtEPZG3G/vZ2RG7OzPIl zLaw== X-Gm-Message-State: AOAM530u98Ce/dEO5RErN77tc3+9eC/VrCcfHayj6mvslbT9zfc300jV 9YnYJZksX6VT3f5OeErSbYs= X-Google-Smtp-Source: ABdhPJyjoq80oagrF13OB+Dma/qPkwg08WDHF9ehrtm/dN9LYa/t4JEvPxchNZt05N3nkPBEfqjBDw== X-Received: by 2002:a63:707:: with SMTP id 7mr14947483pgh.441.1621882080864; Mon, 24 May 2021 11:48:00 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.56.38.102]) by smtp.gmail.com with ESMTPSA id mj7sm160843pjb.47.2021.05.24.11.47.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 May 2021 11:48:00 -0700 (PDT) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id C9F16C0330; Mon, 24 May 2021 11:47:58 -0700 (PDT) To: libc-alpha@sourceware.org Subject: [PATCH v3] x86-64: Align child stack to 16 bytes [BZ #27902] Date: Mon, 24 May 2021 11:47:58 -0700 Message-Id: <20210524184758.902454-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3035.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Libc-alpha" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" In the x86-64 clone wrapper, align child stack to 16 bytes per the x86-64 psABI. Reviewed-by: Carlos O'Donell --- sysdeps/unix/sysv/linux/Makefile | 2 +- sysdeps/unix/sysv/linux/tst-misalign-clone.c | 96 ++++++++++++++++++++ sysdeps/unix/sysv/linux/x86_64/clone.S | 9 +- 3 files changed, 103 insertions(+), 4 deletions(-) create mode 100644 sysdeps/unix/sysv/linux/tst-misalign-clone.c diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 70c3b3f8a3..d355b49033 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -109,7 +109,7 @@ tests += tst-clone tst-clone2 tst-clone3 tst-fanotify tst-personality \ tst-tgkill tst-sysvsem-linux tst-sysvmsg-linux tst-sysvshm-linux \ tst-timerfd tst-ppoll \ tst-clock_adjtime tst-adjtimex tst-ntp_adjtime tst-ntp_gettime \ - tst-ntp_gettimex tst-sigtimedwait + tst-ntp_gettimex tst-sigtimedwait tst-misalign-clone # Test for the symbol version of fcntl that was replaced in glibc 2.28. ifeq ($(have-GLIBC_2.27)$(build-shared),yesyes) diff --git a/sysdeps/unix/sysv/linux/tst-misalign-clone.c b/sysdeps/unix/sysv/linux/tst-misalign-clone.c new file mode 100644 index 0000000000..60f0ed0839 --- /dev/null +++ b/sysdeps/unix/sysv/linux/tst-misalign-clone.c @@ -0,0 +1,96 @@ +/* Verify that the clone wrapper properly aligns the child stack. + Copyright (C) 2021 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static int +check_stack_alignment (void *arg) +{ + bool ok = true; + + puts ("in f"); + + if (TEST_STACK_ALIGN ()) + ok = false; + + return ok ? 0 : 1; +} + +static int +do_test (void) +{ + puts ("in do_test"); + + if (TEST_STACK_ALIGN ()) + FAIL_EXIT1 ("stack isn't aligned\n"); + +#ifdef __ia64__ +# define STACK_SIZE (256 * 1024) +#else +# define STACK_SIZE (128 * 1024) +#endif + + char st[STACK_SIZE + 1]; + /* NB: Align child stack to 1 byte. */ + char *stack = PTR_ALIGN_UP (&st[0], 2) + 1; + +#ifdef __ia64__ + extern int __clone2 (int (*__fn) (void *__arg), void *__child_stack_base, + size_t __child_stack_size, int __flags, + void *__arg, ...); + pid_t p = __clone2 (check_stack_alignment, stack, STACK_SIZE, 0, 0); +#else +# if _STACK_GROWS_DOWN + pid_t p = clone (check_stack_alignment, stack + STACK_SIZE, 0, 0); +# elif _STACK_GROWS_UP + pid_t p = clone (check_stack_alignment, stack, 0, 0); +# else +# error "Define either _STACK_GROWS_DOWN or _STACK_GROWS_UP" +# endif +#endif + + /* Clone must not fail. */ + TEST_VERIFY_EXIT (p != -1); + + int e; + xwaitpid (p, &e, __WCLONE); + if (!WIFEXITED (e)) + { + if (WIFSIGNALED (e)) + printf ("died from signal %s\n", strsignal (WTERMSIG (e))); + FAIL_EXIT1 ("process did not terminate correctly"); + } + + if (WEXITSTATUS (e) != 0) + FAIL_EXIT1 ("exit code %d", WEXITSTATUS (e)); + + return 0; +} + +#include diff --git a/sysdeps/unix/sysv/linux/x86_64/clone.S b/sysdeps/unix/sysv/linux/x86_64/clone.S index 31ac12da0c..7418154c4b 100644 --- a/sysdeps/unix/sysv/linux/x86_64/clone.S +++ b/sysdeps/unix/sysv/linux/x86_64/clone.S @@ -54,12 +54,15 @@ ENTRY (__clone) movq $-EINVAL,%rax testq %rdi,%rdi /* no NULL function pointers */ jz SYSCALL_ERROR_LABEL - testq %rsi,%rsi /* no NULL stack pointers */ - jz SYSCALL_ERROR_LABEL + + /* Align stack to 16 bytes per the x86-64 psABI. */ + andq $-16, %rsi + jz SYSCALL_ERROR_LABEL /* no NULL stack pointers */ /* Insert the argument onto the new stack. */ + movq %rcx,-8(%rsi) + subq $16,%rsi - movq %rcx,8(%rsi) /* Save the function pointer. It will be popped off in the child. */