From nobody Sun Dec 12 14:30:31 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 D7C7A18E8D40; Sun, 12 Dec 2021 14:30:32 +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 4JBn9h0Xzmz4mWZ; Sun, 12 Dec 2021 14:30:32 +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 D747622A30; Sun, 12 Dec 2021 14:30:31 +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 1BCEUVep066616; Sun, 12 Dec 2021 14:30:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BCEUVdP066615; Sun, 12 Dec 2021 14:30:31 GMT (envelope-from git) Date: Sun, 12 Dec 2021 14:30:31 GMT Message-Id: <202112121430.1BCEUVdP066615@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: b4b20492cd92 - main - exec_elf: assert that the image vnode is still locked on return 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b4b20492cd92b5ca7ff03f4140e88363449d3021 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639319432; 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=zTLHW6Z5jNJFqZmEtZeKh7gF9SQqgl88n1dPbc9oGyA=; b=RXoJ8Oc74VGqCA9I73cRrI8Z40PMqCIqTntY/tBhIZyC5j9DhhUThyuoKdvLDv0weLt7c3 wQbZGWVDcP/gl7ikgh/pk5jR63/a4qvUTH5hsdrRqEIZvm+zZHy6Lb0uX3oIBZgkBF/W5t qvN0VyaLdffsXPqaHjBhNa4uUyACfvgmYciUkNdLm0kklIFVZ9nSuF+5ErYAcKOo27MVsh sxpjoP7dN3srTLLPkQnh8PFhJnAA8yItizt/KiSR+R1TCHJc9qo5DTrzupe+FTupm5itCe F8ZXOKWXAEZVCLENLCnXJWTqaCJZo0bQXnahUBiHrSa+/UONlOA79Xmkr3diSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639319432; a=rsa-sha256; cv=none; b=rNTTXx/d13//1p+ff79GfO0jP+SjraRF2UjryF8Dh0FQYQ7bGE5ezHv8i83Xwi3nI32Mn4 xt0fhvZoyv7z2+9E5/s1M6TaX/OX2cRUQKOMTqOW3mi77PXJqGSlA2u4paaEpYmlOdhrlv uLK4txwq2407L8rbNtiUb5ldx3aP5Uydl0qj64hJPQ242j3eDNpGUI7//CngIX1cUPEJ4o u9Amhh59qI6Sq7qPGFVaqPdtb0Hi9qhVEAquHIf/7rLDoiCs9sxf+GQZ/z+2WnVo5quis0 GpB1J5FuocyC0B4gWFnXtknsqR0Jd2TNMcRsp35in8Z4ka1L3gxE9AupMxjOhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b4b20492cd92b5ca7ff03f4140e88363449d3021 commit b4b20492cd92b5ca7ff03f4140e88363449d3021 Author: Konstantin Belousov AuthorDate: 2021-12-09 15:14:46 +0000 Commit: Konstantin Belousov CommitDate: 2021-12-12 14:28:38 +0000 exec_elf: assert that the image vnode is still locked on return Suggested and reviewed by: markj Tested by: pho Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D33359 --- sys/kern/imgact_elf.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/kern/imgact_elf.c b/sys/kern/imgact_elf.c index e66adce562bc..3fe87fe08f5e 100644 --- a/sys/kern/imgact_elf.c +++ b/sys/kern/imgact_elf.c @@ -1363,6 +1363,7 @@ __CONCAT(exec_, __elfN(imgact))(struct image_params *imgp) imgp->proc->p_elf_flags = hdr->e_flags; ret: + ASSERT_VOP_LOCKED(imgp->vp, "skipped relock"); if (free_interp) free(interp, M_TEMP); return (error);