From nobody Wed Feb 16 18:33:05 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A07319D03FA; Wed, 16 Feb 2022 18:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JzRR61B5lz4qcN; Wed, 16 Feb 2022 18:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645036386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZrJg4j1pPprH7s20BrFT1fbbDzmR8rVQQ09tvmhrMBg=; b=vGnN2vi9hVXFtIbP2yi/R9eQjRDP5OJo/7EQXQQt4JJV9Uw+rQD5CbVZa4gHNxAgETuplI REQ2shXgqs8yUuvtEl31SIIiNxfyDDp0zlVB2p3Jp48xDX8cQxlEi45GsO9pzGFV9Zsbqb d5JhPGRzRLVEeM0ETjg9Py9X1eBZpQb3pBlGfg7CMKjDY2IciIP+fRKAKDfg4d6vFfHrmr odHuG0ZpNmkYAK+r6Rxntx7wze9x4XFxEzd6V8d4633qOW/2+xTlaL2Nie/5qLwTXFFnLS LojLZFAEMiDIms23RxsSefbxS/e46loV0YBTKAQaZu1AkoFRPMxgATBUSnq43A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 087A61B32F; Wed, 16 Feb 2022 18:33:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 21GIX54g003602; Wed, 16 Feb 2022 18:33:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21GIX5nR003601; Wed, 16 Feb 2022 18:33:05 GMT (envelope-from git) Date: Wed, 16 Feb 2022 18:33:05 GMT Message-Id: <202202161833.21GIX5nR003601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 2a454b54bfbc - stable/13 - Fix the build after commit 5fa005e91560785dad5183db080209447afde3c2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 2a454b54bfbc831121657d89efa31066a1cc0e00 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1645036386; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZrJg4j1pPprH7s20BrFT1fbbDzmR8rVQQ09tvmhrMBg=; b=ojfzv7cYdmQXjPO1Fe2W9cy20uz5KueDdlS58l1wwjjAF6misNHh1ETymOtnu4qfJQbxo+ Kuei6MS2Hrl9qUQihgDYWchrDkMh6njbgaNwF351HeWVt0G3X8PzbKHalWsZMLtTUDCdxn hEHmDnMjBzttSznFsnF3Xti5aOtQu2gAY91j38h93KpIHltTui5hdsW/h0P105DCY/DBCv KqvxXZtDJ8BvykTzcXB5ZHIcrq41ch6h9pnDIHzldXKECFlmcqaUUD0EhR5DC6wMOfT/tY IvkSbloGWMxJoxAW3Y64DyC7YXtLFz7CnitJtwAPwxlOv1PFeX/Dryh5q06/Cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1645036386; a=rsa-sha256; cv=none; b=tn+8vLUJGkyN57IHjeSQhmMLuLPR9rY2BM201+RgVX7LBVqcMHZY4xLtfAavu/I7NBIB7V WeRmxIqVPwfmdsyuJo601betS3PYMz8VMi8B+mPIW7KW1kt14E7ge2OzunaMAvZ97T5Vrj 6ulxGzccAt19V1mVdiBJyjOVBKwz5b/rUH+bOo6QS7I6VZHDKmr0mRBoTg2Y1GikZVw3TK Ezw/8oqnEPIHEw99/xEBzCsAoQUd/KWxS4oBxWh2InlXBDmv3ITo1cH05xLd6LpId5Xfb0 a/fg7mX9/WnNv6Mn6N0wyGWY5iCd9K1cNU5KLye0GYhXyX7VZACYph4md9g7fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2a454b54bfbc831121657d89efa31066a1cc0e00 commit 2a454b54bfbc831121657d89efa31066a1cc0e00 Author: Mark Johnston AuthorDate: 2022-02-16 18:32:18 +0000 Commit: Mark Johnston CommitDate: 2022-02-16 18:32:18 +0000 Fix the build after commit 5fa005e91560785dad5183db080209447afde3c2 Fixes: 5fa005e91560 ("exec: Reimplement stack address randomization") --- sys/arm64/linux/linux_sysvec.c | 3 +++ sys/kern/kern_exec.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 3188d2f2c57c..6d05d7efa08c 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -45,7 +45,10 @@ __FBSDID("$FreeBSD$"); #include #include +#include +#include #include +#include #include #include diff --git a/sys/kern/kern_exec.c b/sys/kern/kern_exec.c index 49ab7d7b8d27..407c5ab3ed0e 100644 --- a/sys/kern/kern_exec.c +++ b/sys/kern/kern_exec.c @@ -1194,7 +1194,7 @@ exec_new_vmspace(struct image_params *imgp, struct sysentvec *sv) } } - return (sv->sv_onexec != NULL ? sv->sv_onexec(p, imgp) : 0); + return (0); } /*