From nobody Thu Dec 09 04:55:17 2021 X-Original-To: dev-commits-src-main@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 4F81A18CF572; Thu, 9 Dec 2021 04:55:18 +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 4J8hYL0J34z4VTJ; Thu, 9 Dec 2021 04:55:18 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 DB90520D0E; Thu, 9 Dec 2021 04:55:17 +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 1B94tHbt026851; Thu, 9 Dec 2021 04:55:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B94tH7M026850; Thu, 9 Dec 2021 04:55:17 GMT (envelope-from git) Date: Thu, 9 Dec 2021 04:55:17 GMT Message-Id: <202112090455.1B94tH7M026850@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: d2de68811a80 - main - Fix assert check for SV_DSO_SIG in exec_sysvec_init_secondary() List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d2de68811a80bffe20040592dca194238c5a5c86 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639025718; 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=r0DDIhKScKJKtxnA/q+bZcn8wQMfXge8NQ34YPUUtdc=; b=u4zPzXTDkeiXlqk9VppETKM1LC363Wgc6+nLj+LHYWoLevSUCdtiIAjxAlvFf+1nJhADzE N703Sj3rsTALQMb6RAopGxbLDFqFcmmkQm/II7WQ82eL0ag/J5ZkudXH4J7ywG4tC7PGtQ jz/2kc24F1HdwWwrQZLWZ+Y80w0wYiA0m5I/Ilfey+Nahk7Hn+GgsotsU4zpyod+hZ5574 C8uAhxXbz6H5ZC9VlE02PgdEiPLS0z+CQw9WGPgL8QnT1CV7U+7ohiMBfgajegm09j97BZ spUdF5Hdru0ggSJbkpR0J7beOM143Jh5Dawqamagj8yP2LI7I54kkSm2gMUmYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639025718; a=rsa-sha256; cv=none; b=wsTZnj47ac6Oj6wgQYaY4j7FR+j0ZcpxPtA6L6ZQROKoaYfut4yHXdDyK3LRBGL/Y3BWaJ x5C5yHeNX6Y7oi3X3vbn2DvWEm5hPmV6/RzXaITN2iHJtZFwMzcV0Id/deS7+3D23GfBKk 96NJWl//U7a2xl/Y1foI9geHVsuV2i86MZmmYY6W4R8On5q2VEZyGidByu/wDJlP+ZF+Y3 js/8bwMJNsfrClcPUfXsOYlB587gr2/eZoDAdeaEQYsgSWqMgP6G299VW6PDz3XGPER7BJ roK75nQvXkbkc6A6akfynLtSrvZ7kiKcNyxsc77C7qKBumwALi/ixJk2GTHJDQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=d2de68811a80bffe20040592dca194238c5a5c86 commit d2de68811a80bffe20040592dca194238c5a5c86 Author: Justin Hibbits AuthorDate: 2021-12-09 04:50:10 +0000 Commit: Justin Hibbits CommitDate: 2021-12-09 04:54:07 +0000 Fix assert check for SV_DSO_SIG in exec_sysvec_init_secondary() The only requirement for SV_DSO_SIG here is that the flags match between the source and target sysentvec. The current assertion is too strict and fails on powerpc64, the only other architecture than amd64 that uses this function, which doesn't implement sigtramp in a VDSO. Reviewed by: kib Differential Revision: https://reviews.freebsd.org/D33355 --- sys/kern/kern_sharedpage.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/kern_sharedpage.c b/sys/kern/kern_sharedpage.c index 9b36676decd5..3aa5501eafdc 100644 --- a/sys/kern/kern_sharedpage.c +++ b/sys/kern/kern_sharedpage.c @@ -387,8 +387,7 @@ exec_sysvec_init_secondary(struct sysentvec *sv, struct sysentvec *sv2) MPASS((sv2->sv_flags & SV_ABI_MASK) == (sv->sv_flags & SV_ABI_MASK)); MPASS((sv2->sv_flags & SV_TIMEKEEP) == (sv->sv_flags & SV_TIMEKEEP)); MPASS((sv2->sv_flags & SV_SHP) != 0 && (sv->sv_flags & SV_SHP) != 0); - MPASS((sv2->sv_flags & SV_DSO_SIG) != 0 && - (sv->sv_flags & SV_DSO_SIG) != 0); + MPASS((sv2->sv_flags & SV_DSO_SIG) == (sv->sv_flags & SV_DSO_SIG)); MPASS((sv2->sv_flags & SV_RNG_SEED_VER) == (sv->sv_flags & SV_RNG_SEED_VER));