From nobody Mon Jan 20 22:41:35 2025 X-Original-To: dev-commits-src-all@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 4YcQLS14Kbz5l3w2; Mon, 20 Jan 2025 22:41:36 +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 4YcQLS0c51z4PqL; Mon, 20 Jan 2025 22:41:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737412896; 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=dmIMeodK1dhZEBu7RSPwC+mzxNYJRGA2Hk/abyZsSGA=; b=S2KU0/W4OaHMUIa5QM62THenaaKN3atx2ZmClFktK0FQxFyfmo2zarzo48fDZjISXNG0nr coYQ7k7wXFG6TKFgN9MIHXX0QzT04VpBMzo9lP2RDvd8jdY9IJ0iqsG+/ul7MdupF27P8S w8jXndKppNhVLzQwX/PL5DIcIOfnVpHI1B/UysVZAjVpVBJmOJuU05agCMyhn6qBLbnDft UJQFgyFSXtMN0AZlxAkWQ39qIduwL67TpQKX5d+WcWYY479mf0oeYfUWLLgxDK/gg6AI5Y IRbJ1acBgBjPTgZ6rudwkO43dOqf/lD6DO93YjGIASmrsIdjokftBjDQBOVuAw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1737412896; 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=dmIMeodK1dhZEBu7RSPwC+mzxNYJRGA2Hk/abyZsSGA=; b=JLs9qnmyTbXhTj4NSmTt3+rg56/M//E550MpXr7vX/U5/gTFpGwMZDhbWwJX1MTSYseUYX KssSr/NqtJR8y9OEhaRcAzVGpQMF8S/q8eXrXA84XKavNBYsr7x73yR18jWipSwk/B1lP8 ubMTOcI3S5oAOiOmy38Il5O0g2AwAkwRMzYHpiSFyXgJfKZx2624EVU+vaV+AE7YR29F8u Pey1MDQWjO7R04Elnclr9aCZzCw6rThR7mfLodhgazPR1JIX9N2CHAc4mqRaRk3tokNjJ2 PqDWePkXYCyaFanNtkNybalr0cM2VcNwB2J+9L+jmTHZv0/XqR33sQ9XVchk9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1737412896; a=rsa-sha256; cv=none; b=DdLOH/eGvDivRg8E4q+epncXspeVlGiENTwf7JZNx8sUviGf+onaN0gn51TNxvj1TtA0G2 WoOS0cjiT6ihnkUgipzX1K72yBlVGJLVxFQdLD2HWR3CB4ORBWovvGzkCh68q/udanZASf Ulo1jMts95CYe1srFDUIlVa6zOtcjobJUyfrzYS2/XTl0JD6XJL25wsZ3vXG0pgE2Ug5RG L2l/S80ao1rFFBHVWwAH4ChiljFgMIbdc4PgQyb2omkuuJZigT5sdyKGHxN5STDUZc1JGX moFmgU1mtCfhOKtP27weCXR6EB4MyMKpTGuqItOHXDS0+obe0w7vxQzoRD6hbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4YcQLR70v5zgX6; Mon, 20 Jan 2025 22:41:35 +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 50KMfZS8020836; Mon, 20 Jan 2025 22:41:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 50KMfZf7020833; Mon, 20 Jan 2025 22:41:35 GMT (envelope-from git) Date: Mon, 20 Jan 2025 22:41:35 GMT Message-Id: <202501202241.50KMfZf7020833@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Somers Subject: git: e8a272048a0f - stable/13 - fusefs: fix a memory leak List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: asomers X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e8a272048a0fc9f558c7788dd06b0159b56c4585 Auto-Submitted: auto-generated The branch stable/13 has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=e8a272048a0fc9f558c7788dd06b0159b56c4585 commit e8a272048a0fc9f558c7788dd06b0159b56c4585 Author: Alan Somers AuthorDate: 2024-12-23 20:26:11 +0000 Commit: Alan Somers CommitDate: 2025-01-20 22:36:27 +0000 fusefs: fix a memory leak Fix a leak of a fuse_ticket structure. The leak mostly affected NFS-exported fuse file systems, and was triggered by a failure during FUSE_LOOKUP. Sponsored by: ConnectWise (cherry picked from commit 969d1aa4dbfcbccd8de965f7761203208bf04e46) --- sys/fs/fuse/fuse_vfsops.c | 2 +- tests/sys/fs/fusefs/nfs.cc | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/sys/fs/fuse/fuse_vfsops.c b/sys/fs/fuse/fuse_vfsops.c index 858fd768cb1d..156e7b288c85 100644 --- a/sys/fs/fuse/fuse_vfsops.c +++ b/sys/fs/fuse/fuse_vfsops.c @@ -566,7 +566,7 @@ fuse_vfsop_vget(struct mount *mp, ino_t ino, int flags, struct vnode **vpp) error = fdisp_wait_answ(&fdi); if (error) - return error; + goto out; feo = (struct fuse_entry_out *)fdi.answ; if (feo->nodeid == 0) { diff --git a/tests/sys/fs/fusefs/nfs.cc b/tests/sys/fs/fusefs/nfs.cc index 79fead8e77cb..27ffc8f5cbc1 100644 --- a/tests/sys/fs/fusefs/nfs.cc +++ b/tests/sys/fs/fusefs/nfs.cc @@ -144,6 +144,36 @@ TEST_F(Fhstat, lookup_dot) EXPECT_EQ(mode, sb.st_mode); } +/* Gracefully handle failures to lookup ".". */ +TEST_F(Fhstat, lookup_dot_error) +{ + const char FULLPATH[] = "mountpoint/some_dir/."; + const char RELDIRPATH[] = "some_dir"; + fhandle_t fhp; + struct stat sb; + const uint64_t ino = 42; + const mode_t mode = S_IFDIR | 0755; + const uid_t uid = 12345; + + EXPECT_LOOKUP(FUSE_ROOT_ID, RELDIRPATH) + .WillOnce(Invoke(ReturnImmediate([=](auto in __unused, auto& out) { + SET_OUT_HEADER_LEN(out, entry); + out.body.entry.attr.mode = mode; + out.body.entry.nodeid = ino; + out.body.entry.generation = 1; + out.body.entry.attr.uid = uid; + out.body.entry.attr_valid = UINT64_MAX; + out.body.entry.entry_valid = 0; + }))); + + EXPECT_LOOKUP(ino, ".") + .WillOnce(Invoke(ReturnErrno(EDOOFUS))); + + ASSERT_EQ(0, getfh(FULLPATH, &fhp)) << strerror(errno); + ASSERT_EQ(-1, fhstat(&fhp, &sb)); + EXPECT_EQ(EDOOFUS, errno); +} + /* Use a file handle whose entry is still cached */ TEST_F(Fhstat, cached) {