From nobody Mon May 01 15:40:48 2023 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 4Q96qh6m0qz48gmd; Mon, 1 May 2023 15:40:48 +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 4Q96qh6MVdz3s4C; Mon, 1 May 2023 15:40:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682955648; 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=Z+QY7Fkym7acnMeba4wRvUhJJRPfzHSro/xZ6ik+CvI=; b=oChBSBqgmhmlYVLcXfORJrO658Xy6A+M1dORIgtUB1Ia/J2CUrgFxdtCh8T6+4TaU3FJDx p7tGwPmRqIpXdWRlGrE43cvb+oTK2f8/8prgNnJTKBRDAK3PBsdyTUdnq5EBhAnA+JADGZ indGX15Ie0jXE4odmItdflYLR/fIvxWh0AaS0Sz6O4nZqkA6VX7gL3EID1oYyd7ysenHMR J0h4xrMxxJ5QMlKPdmXE9+YWlfyAtaD9jBPN7M8hdkF4gUw/CExeeFAxcPQcVTZ9i2fJ41 xAGP0rfQwLc0dkpKU4LVqZTRJvthXUXyEXgq6Jg3GPCgcErBpMa8aGpxG5MsqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682955648; 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=Z+QY7Fkym7acnMeba4wRvUhJJRPfzHSro/xZ6ik+CvI=; b=NzSqbQItyXVRRoglzofAIW+i/E3ZdeMVhbAOlpmDGlhDKbXjfg4BfhcmddE3mm26GW1sy9 PStgOt/UbIZOYh/F+VRC+6wguM4hfVbgjTrh68Qm46QcWW/V8cvqnhWzrBRs5INzd6QK/R mSAfshqYFkxPvE/pYpdzV7tMcTbAEaDa9viODNZfoh7LgvmmHU/GzMNu0iLJIKSZBG1R6D WVKLRHcIzlbsyaDvsVcZNVQPUdsK5Dy6zxY/toP5yyeOrp27PfBUKlx6gFaAOKZVnB6fBX x3klNDN+FQaB2MAj+yHv95F22xmm49p7S1TvTRSf14KddbLrFq+5IbLS0ZDlkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682955648; a=rsa-sha256; cv=none; b=UsN946jrW9X1RLsxMohJOxNgpQd4UIPUCd6eftpKwu007PqXF+clZk3UaYLCkbDqpdwcCq 6sxsh5jIvAWahUupgOoVfzpIVufdIQUJLUoNIJG0GjsaOhmvnjOVu94Zo/xk+1vQ19u8b3 cGEmeuFbr/K7pBhLe3CzBf9iHeYfcqAWAsqOcH8hOhsuG/uHZWrxC8gyZOx52+/RwAmOa/ K9NuczjNHzEeKyuYp9cZs/p12nBZjNRSZIinK0DmtjdiUU3ZL98DcXNx3PjgUucDoL+4Af GNp/viHIvCQ5ZJ7GGNZ1dpQvN3Zgn4SWTpL7dU5MlPgRz+t4m8a4z2OV+EpcTw== 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 4Q96qh5L1Dz19Fv; Mon, 1 May 2023 15:40:48 +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 341Fem5v017375; Mon, 1 May 2023 15:40:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 341Femeh017374; Mon, 1 May 2023 15:40:48 GMT (envelope-from git) Date: Mon, 1 May 2023 15:40:48 GMT Message-Id: <202305011540.341Femeh017374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: e11d11c543e7 - main - kinst: test lock in kinst_trampoline_dealloc_locked() 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: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e11d11c543e7303685c8b5a32bb0338cd3e61f1e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=e11d11c543e7303685c8b5a32bb0338cd3e61f1e commit e11d11c543e7303685c8b5a32bb0338cd3e61f1e Author: Christos Margiolis AuthorDate: 2023-05-01 15:22:37 +0000 Commit: Mark Johnston CommitDate: 2023-05-01 15:40:29 +0000 kinst: test lock in kinst_trampoline_dealloc_locked() Reviewed by: markj MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39883 --- sys/cddl/dev/kinst/trampoline.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c index ba61faa2b3ab..6614a6ed9302 100644 --- a/sys/cddl/dev/kinst/trampoline.c +++ b/sys/cddl/dev/kinst/trampoline.c @@ -163,6 +163,8 @@ kinst_trampoline_dealloc_locked(uint8_t *tramp, bool freechunks) struct trampchunk *chunk; int off; + sx_assert(&kinst_tramp_sx, SX_XLOCKED); + if (tramp == NULL) return;