From nobody Thu Jun 5 22:43:12 2025 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 4bCzxY4NbXz5yTNG; Thu, 05 Jun 2025 22:43:13 +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 4bCzxX6BJmz4Mfm; Thu, 05 Jun 2025 22:43:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749163392; 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=9q0xkZflAt1yl5EOy8w3edvFaMoQCPfVhVUp+eWPadE=; b=NQeu51NXKL0oHa58Id5pO+rb8BaEOx0U3PN7Xn6tcfM+d9s2t3UH4vWk5kFqIxnQwvJI/S zBZD3oyHldOFqD3i8hSg7xHsiKWgcWPoWHHnErmaVmftusKeRie2krDPoSMW1q6JO7y5sH Jqb2GVTGmpqJceRI6EKt6FJInTKdBf2my1nWnoCz8XgJzc98RBdf4vpyJBFhDt5tU3JKvB hvBPWaI6AWV+sQzJ3ru4XhbHz13A/knDPAbRFdwvXIYf9+8rePKVsdDPPDh9YUDHDwIQ+q XyaGuuBSSjKffUHs4UVcz0ENIzR0bMA4jbRrioQqrtHGP/8zt2WZ5g+tWZ6ceQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749163392; 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=9q0xkZflAt1yl5EOy8w3edvFaMoQCPfVhVUp+eWPadE=; b=vlDacQUZrrsQWpMwAA2qKlvvif1EnU/lXtfSlvqGh8vQNw3SAeydB8IsQrDR5p0DE8J2g1 Qt2jaoChpEw4QknAHaM1cMV7hnf0p6r1OJkif4crQ1ImKeXph7OIiCVD5wSQiDoJQKP1EC ciXbOUcd37u9MXH7UxXxoYVWD7CJqzSlQms9B4RCMbLTJQ0r1jTS8ytliiFzen9wrVUS3d C/HolvCeXmWRQFabz5LbZve8HcEQXJ1k+1nDN7Umk9CdRG7luPEaJHr1mz4g0RaR1IAdo1 QTvdX3A1AU1HQUlMGJZv8gZvBnbpPbTAZeoM0Ps6mTrtjWzEp0IL9bDF0dwOVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749163392; a=rsa-sha256; cv=none; b=W+UYp5fG3rFh5CfYHqQ17IUL6Ke/v4k6Ra9JGr1jK3JQ9aoKq81w3S1XGG6uNTm44ecokA iF2zmUwCrDFPkiPliaiJeYp6pUGjyArth0MwGLDEoyYpjr5Jd1FazstscM0emK2pYB4sSk FSs7qZPaZ3hBFpjsesWMPqI+qZ6BG289UDYt5msZMV+fr8kQNmPEkhNyw8v0ja2Rp57K5i LTofGRDii0R2J4NDkmqhBlNxDeHveT2nqHhzdz0fsQ2/E8l7yCtFTRUJU63wJCzsF9JyS8 qih0PzBWPVYZozifgOi7/cRy7G14LLLBhATNbogPcgKx8QF5STRd5KMPkuUobw== 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 4bCzxX5nC5zD1G; Thu, 05 Jun 2025 22:43:12 +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 555MhCRU075289; Thu, 5 Jun 2025 22:43:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555MhCtx075286; Thu, 5 Jun 2025 22:43:12 GMT (envelope-from git) Date: Thu, 5 Jun 2025 22:43:12 GMT Message-Id: <202506052243.555MhCtx075286@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: e9897199576a - main - pseudofs: make dup name an error instead of panic 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: e9897199576a40360440aa4d2aa48d61c4010f11 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e9897199576a40360440aa4d2aa48d61c4010f11 commit e9897199576a40360440aa4d2aa48d61c4010f11 Author: Konstantin Belousov AuthorDate: 2025-06-03 20:01:24 +0000 Commit: Konstantin Belousov CommitDate: 2025-06-05 22:41:40 +0000 pseudofs: make dup name an error instead of panic There are enough cases where the duplicate name is caused by dubious hardware configuration. Stopping the whole system instead of failing a driver, or even a diagnostic subsystem in a driver, is more user-friendly. Another issue right now is that the check is only present for the INVARIANTS builds, silently accepting the request to create an entry with the existing name on production builds. Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D50669 --- 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); }