From patchwork Tue Sep 19 15:51:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 815628 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-84747-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="TzCvs0QM"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3xxS6T6L11z9sPk for ; Wed, 20 Sep 2017 01:51:45 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=Z456h3YAkPjWHRZSnNojFtg8OeV4f 1xQmLeV/sz1l95SyFLZnjqhteMocXDHDwpSSChfvVCvLHoweSK/Og+fkMiaeHCWp 7KPeiVv0gUO9TMh6AAJbUwN+dCtv2kjjeDfKobvYFfZaRmEQVPcymRDk0QAPfCWQ YUCU+g0B25/z7g= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=hzkyBNodysmkXBLu2Xxl0PVN4HQ=; b=TzC vs0QMYFAbmcoN4hFuYmG2Hj353W+emiheKl9fR/C+dW5L4xGrZ8EQ51PO9J8BZdP Gjx1Vd3Ipf9Fz4Cu/299nQ+nbtHHW8+i3aVgq2RlO+VgKj9Y2pj0n6bDh4pqt4Mh BIk2c1w6W80UmReRHIDyEcDXOXjjdFkkMXVovvhU= Received: (qmail 5712 invoked by alias); 19 Sep 2017 15:51:34 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 5665 invoked by uid 89); 19 Sep 2017 15:51:34 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Tue, 19 Sep 2017 15:51:23 +0000 From: Joseph Myers To: Subject: Fix fexecve build where syscall macros call sizeof [committed] Message-ID: User-Agent: Alpine 2.20 (DEB 67 2015-01-07) MIME-Version: 1.0 X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) The recent fexecve changes broke the build on (at least) alpha (maybe other configurations, that was the first breakage I saw in my build-many-glibcs.py run): In file included from ../sysdeps/unix/sysv/linux/alpha/sysdep.h:29:0, from ../sysdeps/alpha/nptl/tls.h:31, from ../include/errno.h:25, from ../sysdeps/unix/sysv/linux/fexecve.c:18: ../sysdeps/unix/sysv/linux/fexecve.c: In function 'fexecve': ../sysdeps/unix/alpha/sysdep.h:203:10: error: 'sizeof' on array function parameter 'argv' will return size of 'char * const*' [-Werror=sizeof-array-argument] (sizeof(arg) == 4 ? (long)(int)(long)(arg) : (long)(arg)) ^ ../sysdeps/unix/alpha/sysdep.h:302:26: note: in expansion of macro 'syscall_promote' register long _tmp_18 = syscall_promote (arg3); \ ^~~~~~~~~~~~~~~ ../sysdeps/unix/alpha/sysdep.h:173:2: note: in expansion of macro 'inline_syscall5' inline_syscall##nr(__NR_##name, args); \ ^~~~~~~~~~~~~~ ../sysdeps/unix/sysv/linux/alpha/sysdep.h:85:2: note: in expansion of macro 'INLINE_SYSCALL1' INLINE_SYSCALL1(name, nr, args); \ ^~~~~~~~~~~~~~~ ../sysdeps/unix/sysv/linux/fexecve.c:42:3: note: in expansion of macro 'INLINE_SYSCALL' INLINE_SYSCALL (execveat, 5, fd, "", argv, envp, AT_EMPTY_PATH); ^~~~~~~~~~~~~~ ../sysdeps/unix/sysv/linux/fexecve.c:33:30: note: declared here fexecve (int fd, char *const argv[], char *const envp[]) ^~~~ This patch fixes this similarly to previous fixes for such issues: use &argv[0] and &envp[0] as the syscall macro arguments. Tested (compilation only) for alpha-linux-gnu with build-many-glibcs.py. Committed. 2017-09-19 Joseph Myers * sysdeps/unix/sysv/linux/fexecve.c (fexecve) [__NR_execveat]: Explicitly take address of first element of array arguments in call to INLINE_SYSCALL. diff --git a/sysdeps/unix/sysv/linux/fexecve.c b/sysdeps/unix/sysv/linux/fexecve.c index 3bf5de5..4065249 100644 --- a/sysdeps/unix/sysv/linux/fexecve.c +++ b/sysdeps/unix/sysv/linux/fexecve.c @@ -39,7 +39,8 @@ fexecve (int fd, char *const argv[], char *const envp[]) } #ifdef __NR_execveat - INLINE_SYSCALL (execveat, 5, fd, "", argv, envp, AT_EMPTY_PATH); + /* Avoid implicit array coercion in syscall macros. */ + INLINE_SYSCALL (execveat, 5, fd, "", &argv[0], &envp[0], AT_EMPTY_PATH); # ifndef __ASSUME_EXECVEAT if (errno != ENOSYS) return -1;