Skip to content

Commit

Permalink
fusefs: fix a memory leak
Browse files Browse the repository at this point in the history
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.

MFC after:	2 weeks
Sponsored by:	ConnectWise
  • Loading branch information
asomers committed Dec 23, 2024
1 parent 003818a commit 969d1aa
Show file tree
Hide file tree
Showing 2 changed files with 31 additions and 1 deletion.
2 changes: 1 addition & 1 deletion sys/fs/fuse/fuse_vfsops.c
Original file line number Diff line number Diff line change
Expand Up @@ -565,7 +565,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) {
Expand Down
30 changes: 30 additions & 0 deletions tests/sys/fs/fusefs/nfs.cc
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down

0 comments on commit 969d1aa

Please sign in to comment.