From nobody Thu Jun 12 04:48:36 2025 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 4bHqmP3Mg5z5y6FB; Thu, 12 Jun 2025 04:48:37 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bHqmP0cPtz3R5K; Thu, 12 Jun 2025 04:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749703717; 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=+gh7e41+a3vtV6IrKucQI9ckoZOpVPfK5xrrOVr2sfE=; b=FsV9O4yQn+tywtVnWDKuIRe4Q//qd1XlMdYTis+lUWoJr2fYK6N1WORM60kK1risZ4eDuM tM7tQihGnVJCG6jsHX2un0TtcT/V0MHvX07Q+h1004/iGV2DGZpv/TJ1vC65QS9UdaQoTw ZG23YCdxwT/CqZBYJlPT3TSkuSAALVcGA1RzJHrFTbZXGgOvT90ebqssxk4ctjvqacYNi3 9u77+10CX4gh1mYUuS2KRz/HC27mDWQ3lN015P3ekD7FxU/Ca5Cfs6T7xGG99VTjq57gzt zwAB13UKpaIdCY46fx+XeaAGKMP64vDd0JS9y9/Ga/34IH+nWAz3qMpnIOciYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749703717; 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=+gh7e41+a3vtV6IrKucQI9ckoZOpVPfK5xrrOVr2sfE=; b=V8MI+PnlVGX+unFOeRLsJ9Cc4qO9E1sbawyO1aPjGcTYgf/DDUB3eZ32LfmNNy8F2cEW1F AF1HpgvT7RH1eC1mcPubi+Fh1WPNxrxrg+QEhYF92u9FbpaASkpkbTo+5DoUTxgFVR713y 5hwdjKpMV7uSw9NlAjlHSBP/DsWy/gKhjfuogoupP/mwZhK7qAlvPJ3iEeldMlUQ5nf1P0 Rh5d5GOsM0Q/UDaD/qznzxY9yY+zHgavHMBsOyw1SaWnSWd+D43riEEcqAvWlbvmEb9ib0 X3KW5TERP7QrE2sbQrHMio+DPlvBj82Tz7He5woQiCVVvbQsK6isoVVjHYpV7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749703717; a=rsa-sha256; cv=none; b=J8bWgIXirneUu31xOhSsrDVkwZ/yfT/ZvlgDq/oh2bcpbwiCQXQN3FG2UaTcQw7KHyYxYM 0jA/0Iczu6NN6IGZID/wOpGsfK1Q00XvmvKIeyQzaYpWEBpNXhENVLlahpWq7dId05vZ8R MrUgJpJop667KkHxxPcdq+MWkNjD8PJx95XQ6qzA+E4gNlK8pnG+HDL+JDDSIp3HrYQ2/f RucejMqIyNwCFNauaRT+6SNSpQ+ePFZ3FFBYeL4hkCO4R8lPmjKj2GHBtIfNyy2aYMQAjC pwFfCbka5hkfbocZ8ZXnyvmSb4pvM3A9owG9yuO8kcMBKTdzwh6oWRKPqp009g== 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 4bHqmP0CDpzxky; Thu, 12 Jun 2025 04:48:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55C4maiX066662; Thu, 12 Jun 2025 04:48:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55C4maMV066659; Thu, 12 Jun 2025 04:48:36 GMT (envelope-from git) Date: Thu, 12 Jun 2025 04:48:36 GMT Message-Id: <202506120448.55C4maMV066659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: df6406ca958c - stable/14 - pseudofs: make dup name an error instead of panic 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: df6406ca958c9d622037bf969f05b978b1d5faad Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=df6406ca958c9d622037bf969f05b978b1d5faad commit df6406ca958c9d622037bf969f05b978b1d5faad Author: Konstantin Belousov AuthorDate: 2025-06-03 20:01:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-12 04:28:27 +0000 pseudofs: make dup name an error instead of panic (cherry picked from commit e9897199576a40360440aa4d2aa48d61c4010f11) --- sys/fs/pseudofs/pseudofs.c | 53 +++++++++++++++++++++++++++++++--------------- 1 file changed, 36 insertions(+), 17 deletions(-) diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index eafa2947490a..ef45f96a6192 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -98,12 +98,10 @@ pfs_alloc_node(struct pfs_info *pi, const char *name, pfs_type_t type) /* * Add a node to a directory */ -static void +static int pfs_add_node(struct pfs_node *parent, struct pfs_node *pn) { -#ifdef INVARIANTS struct pfs_node *iter; -#endif KASSERT(parent != NULL, ("%s(): parent is NULL", __func__)); @@ -123,9 +121,6 @@ pfs_add_node(struct pfs_node *parent, struct pfs_node *pn) KASSERT(iter->pn_type != pfstype_procdir, ("%s(): nested process directories", __func__)); for (iter = parent->pn_nodes; iter != NULL; iter = iter->pn_next) { - KASSERT(strcmp(pn->pn_name, iter->pn_name) != 0, - ("%s(): homonymous siblings: '%s' type %d", __func__, - pn->pn_name, pn->pn_type)); if (pn->pn_type == pfstype_procdir) KASSERT(iter->pn_type != pfstype_procdir, ("%s(): sibling process directories", __func__)); @@ -134,8 +129,19 @@ pfs_add_node(struct pfs_node *parent, struct pfs_node *pn) pn->pn_parent = parent; pfs_fileno_alloc(pn); - pfs_lock(parent); + for (iter = parent->pn_nodes; iter != NULL; iter = iter->pn_next) { + if (strcmp(pn->pn_name, iter->pn_name) != 0) + continue; + printf("pfs_add_node: homonymous siblings: '%s/%s' type %d", + parent->pn_name, pn->pn_name, pn->pn_type); + /* Do not detach, because we are not yet attached. */ + pn->pn_parent = NULL; + pfs_unlock(parent); + return (EEXIST); + } + + if ((parent->pn_flags & PFS_PROCDEP) != 0) pn->pn_flags |= PFS_PROCDEP; if (parent->pn_nodes == NULL) { @@ -152,6 +158,7 @@ pfs_add_node(struct pfs_node *parent, struct pfs_node *pn) parent->pn_last_node = pn; } pfs_unlock(parent); + return (0); } /* @@ -197,6 +204,7 @@ static int pfs_fixup_dir_flags(struct pfs_node *parent, int flags) { struct pfs_node *dot, *dotdot; + int rc; dot = pfs_alloc_node_flags(parent->pn_info, ".", pfstype_this, flags); if (dot == NULL) @@ -206,9 +214,14 @@ pfs_fixup_dir_flags(struct pfs_node *parent, int flags) pfs_destroy(dot); return (ENOMEM); } - pfs_add_node(parent, dot); - pfs_add_node(parent, dotdot); - return (0); + rc = pfs_add_node(parent, dot); + if (rc == 0) + rc = pfs_add_node(parent, dotdot); + if (rc != 0) { + pfs_destroy(dot); + pfs_destroy(dotdot); + } + return (rc); } static void @@ -237,11 +250,12 @@ pfs_create_dir(struct pfs_node *parent, const char *name, pn->pn_vis = vis; pn->pn_destroy = destroy; pn->pn_flags = flags; - pfs_add_node(parent, pn); - rc = pfs_fixup_dir_flags(pn, flags); - if (rc) { + rc = pfs_add_node(parent, pn); + if (rc == 0) + rc = pfs_fixup_dir_flags(pn, flags); + if (rc != 0) { pfs_destroy(pn); - return (NULL); + pn = NULL; } return (pn); } @@ -264,8 +278,10 @@ pfs_create_file(struct pfs_node *parent, const char *name, pfs_fill_t fill, pn->pn_vis = vis; pn->pn_destroy = destroy; pn->pn_flags = flags; - pfs_add_node(parent, pn); - + if (pfs_add_node(parent, pn) != 0) { + pfs_destroy(pn); + pn = NULL; + } return (pn); } @@ -287,7 +303,10 @@ pfs_create_link(struct pfs_node *parent, const char *name, pfs_fill_t fill, pn->pn_vis = vis; pn->pn_destroy = destroy; pn->pn_flags = flags; - pfs_add_node(parent, pn); + if (pfs_add_node(parent, pn) != 0) { + pfs_destroy(pn); + pn = NULL; + } return (pn); }