From owner-dev-commits-src-all@freebsd.org Sat Dec 26 00:19:39 2020 Return-Path: Delivered-To: dev-commits-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 694BA4CDF5B; Sat, 26 Dec 2020 00:19:39 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4D2kvt71y0z4Y49; Sat, 26 Dec 2020 00:19:38 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.16.1/8.16.1) with ESMTPS id 0BQ0JOnQ074972 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 26 Dec 2020 02:19:27 +0200 (EET) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 0BQ0JOnQ074972 Received: (from kostik@localhost) by tom.home (8.16.1/8.16.1/Submit) id 0BQ0JO0G074971; Sat, 26 Dec 2020 02:19:24 +0200 (EET) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Sat, 26 Dec 2020 02:19:24 +0200 From: Konstantin Belousov To: Brandon Bergren Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: ed52452d6e52 - MFC r368772: Add ELF flag to disable ASLR stack gap. Message-ID: References: <202012251347.0BPDlc8U082236@gitrepo.freebsd.org> <0daef1d3-4b70-430e-acfe-5c881a53341c@www.fastmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <0daef1d3-4b70-430e-acfe-5c881a53341c@www.fastmail.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on tom.home X-Rspamd-Queue-Id: 4D2kvt71y0z4Y49 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: dev-commits-src-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: "Commit messages for all branches of the src repository." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 26 Dec 2020 00:19:39 -0000 On Fri, Dec 25, 2020 at 06:04:27PM -0600, Brandon Bergren wrote: > Build broken on stable-12 i386 (detected by my local CI where I'm testing git CI): > > 17:26:24 --- kern_exec.o --- > 17:26:24 /usr/src/sys/kern/kern_exec.c:1508:34: error: incompatible pointer types passing 'uintptr_t *' (aka 'unsigned int *') to parameter of type 'u_long *' (aka 'unsigned long *') [-Werror,-Wincompatible-pointer-types] > 17:26:24 imgp->sysent->sv_stackgap(imgp, dp); > 17:26:24 ^~ Thanks. Can you confirm that the following change is enough ? commit 77419219289fe0817fae255b48db69718d91f816 Author: Konstantin Belousov Date: Sat Dec 26 02:16:29 2020 +0200 Cast sv_stackgap argument to minimally intrusively handle difference between 12 and HEAD. On all supported architectures representation of longs and pointers is same. Reported by: bdragon diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 812d5e82709..64c9e84db07 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1505,7 +1505,7 @@ exec_stackgap(struct image_params *imgp, uintptr_t *dp) NT_FREEBSD_FCTL_ASG_DISABLE)) != 0 || (imgp->map_flags & MAP_ASLR) == 0) return; - imgp->sysent->sv_stackgap(imgp, dp); + imgp->sysent->sv_stackgap(imgp, (u_long *)dp); } /*