From nobody Sun Apr 12 13:44:14 2026 X-Original-To: dev-commits-src-branches@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 4ftsGC50S0z6ZM87 for ; Sun, 12 Apr 2026 13:44:19 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ftsGC1dTPz3l1W for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; 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=fT8Cj21+H2nwTjeN6Pu8twaakp4JvqDRVet0THlPb3U=; b=apGKNzp197tfTqOLEFAsEnKz32PXpz/CDDnteZD9JMPGJwOUrxSfXFE3MKhmKVXXoPaj86 CX1qsrfZVK9bKopJm98oImP5ExGJWMFjcJK+1GbUWPV6Fj0YWTXDC5H+tmpy3bsJPZ3RGf gSfIi1DdyKsShdiXF7Tj1zekSq06qNnztNVgBaj1vbj+TmwQGdMRj3ULDGoM5etoQEDjEk wKHDafM7Q7Iw9DIqackPQSj2N9K2fuGOD50Lfls5AeTixDXHuX7xHlgAPLKCRmxH/bb05H 0LiB4H8PgUmjI8Q+jaRlLTaDbfYCh8GqpspXo7wmP/v2sPx+2YGHKaSFvCHViQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1776001459; a=rsa-sha256; cv=none; b=gM5UUeuRFmSfPr/x71uhSezs+8+ZMRRz+7we8eLYtCYsVTiJMN8RZxm2zlapvDo+tyFLv6 N9BxW9gTkzpQs56XelQBfrVFqRBtqygfYH5TTrnJEDvWODCXfWNFP0+qFlNt6XHIqLHzRa P+wFl9boVToTAJC4VH8X57YQus9v2AJPoeKevjnhJw1nvFCTqZVftZ1WqcDoHXqaglaBrV ZyRbcwTLRiu/rHaboYQ3glZdJjAZp6JmTdbaPCSiPdCddz6MxkIZmRMOCRZj+FtetiwSNG 0Q7X2C00vP18WbRfrIap+hPwQTCGSow52dsdYay+Fmdh4cJWcoONr6S9iSpp3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1776001459; 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=fT8Cj21+H2nwTjeN6Pu8twaakp4JvqDRVet0THlPb3U=; b=VCXOOsfJcnYDQQZIFraSSMkYzCuxx/RWrSoiTA3Ks1O3M6Y2q5B0nkzVtLuAfAYmHJ5OY2 7TIttgPEO9PuVgzW1tFC8RVss6ZAdR529Nk7cG3VX3xIfr4zHGx7R1hCJG8YcsSBjFkJCa rbE3PGtkPAf9BZGr4MjSMjRPcqW2ZxCUUEmS+8vDh7vvxoK/2DlJ5hnu7qSbdJA6UDVxxF 7qf54DtjXpeChZiyJgVIaVMSKTRbl4wnL1ubuak80HQ5GlLRy5yRJ2zCI1Ry9TrSStmNRA MIsvh/baBzI/e0WC4JplT1B+zrGs0NL9drWcSPAk+xsf9hmnS3rndRNgy1WV2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4ftsGC1CpHz4TP for ; Sun, 12 Apr 2026 13:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42f53 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 12 Apr 2026 13:44:14 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 675ea9d1d6a5 - stable/14 - vfs: handle vfs_init() failures List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 Auto-Submitted: auto-generated Date: Sun, 12 Apr 2026 13:44:14 +0000 Message-Id: <69dba1ae.42f53.3afd904e@gitrepo.freebsd.org> The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 commit 675ea9d1d6a5ca8d224f5fdb2d01ef3fee8e6325 Author: Kyle Evans AuthorDate: 2025-09-04 02:08:51 +0000 Commit: Kyle Evans CommitDate: 2026-04-12 13:43:39 +0000 vfs: handle vfs_init() failures Most vfs_init implementations will not fail, with the notable current exception that tmpfs_subr_init() can fail to allocate a new swap pager type, in which case we probably do not want to proceed and keep it registered. linsysfs was a potential consumer, but we opted to go a different direction and move pseudofs init/deinit over to first mount and last mount instead. Reviewed by: fuz, kib (cherry picked from commit 6d33507ff9b877f52516df00b012715b55d4e14f) --- sys/kern/vfs_init.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index e516d929d9d0..880a8780c367 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -404,7 +404,7 @@ vfs_register(struct vfsconf *vfc) static int once; struct vfsconf *tvfc; uint32_t hashval; - int secondpass; + int error, prevmaxconf, secondpass; if (!once) { vattr_null(&va_null); @@ -422,6 +422,7 @@ vfs_register(struct vfsconf *vfc) return (EEXIST); } + prevmaxconf = maxvfsconf; if (vfs_typenumhash != 0) { /* * Calculate a hash on vfc_name to use for vfc_typenum. Unless @@ -514,16 +515,24 @@ vfs_register(struct vfsconf *vfc) vfc->vfc_vfsops = &vfsops_sigdefer; } - if (vfc->vfc_flags & VFCF_JAIL) - prison_add_vfs(vfc); - /* * Call init function for this VFS... */ if ((vfc->vfc_flags & VFCF_SBDRY) != 0) - vfc->vfc_vfsops_sd->vfs_init(vfc); + error = vfc->vfc_vfsops_sd->vfs_init(vfc); else - vfc->vfc_vfsops->vfs_init(vfc); + error = vfc->vfc_vfsops->vfs_init(vfc); + + if (error != 0) { + maxvfsconf = prevmaxconf; + TAILQ_REMOVE(&vfsconf, vfc, vfc_list); + vfsconf_unlock(); + return (error); + } + + if ((vfc->vfc_flags & VFCF_JAIL) != 0) + prison_add_vfs(vfc); + vfsconf_unlock(); /*