From nobody Thu Oct 5 16:15:15 2023 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 4S1c901CXqz4vw0Z; Thu, 5 Oct 2023 16:15:16 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S1c900mpQz3SHV; Thu, 5 Oct 2023 16:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1696522516; 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=tEZermLQkHYy8GLPVHF3HeaJmhJHrhzCrsaOEx9igLQ=; b=FHpNmMJ7PRrB0XNQD6CrEBJlYzKkFGXChBMvu9zh9Svo9EGMV+oiVcIuENZKfmTrjnbGsY waHMoLaZTNlmpZgzrzY5XY7b8SK876wszGgYtxOSyGEOgsCJiDj4tWSdd3Yx/HbowaMdS8 8Tq6Mgl60juoq+GEUTO0zdQlVmexXwdw/W6Pkhk+XkbxY0glEurmR/FWuJYZqlJ9olTLbH iVz03hDE73KbCwGIEz3nLpJFDzlqBqx3IOovo7Cmi9GFCgMxcmgWUzTWCONW1g2C+V1pgp kN0ms/cG73dGSDXoDSRZkHUjp7EaUXPBglE9XT34fv9g1AIxeqJRbPECCnwLFA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1696522516; a=rsa-sha256; cv=none; b=iEqQ37vWW2h1fxqUlddCPVZasfifQ6AhLoXaX75Ubn1hAeMeC2iNbg5gJnMZZq37KgyvcL neihhYp/xDEN2R9f5+gfRq41BLd6k99ShzcxQB0AnFvODuTkTaHIuJ1Xop13V1hbzoDryn k8tcvGIt5pIllgsZW8Gmkk4VYjv8kM07pKU7G76LiLFW+nKUlkviV1ADTaETGmIe+yfgKN ZCnfFqNPGWn8RJnUQtcFjYyD16nFSSAT6lXHM369UNbE8CdY+y0SEsAAdYclO1s4U6XFSL chTE9HVhW6s85j0K+8zcbxjGmeb0jRI9AHwpfHvfiSdeik4WmpOUJ+JJ8cfm3A== 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=1696522516; 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=tEZermLQkHYy8GLPVHF3HeaJmhJHrhzCrsaOEx9igLQ=; b=Y+GyH3ZATgwLeaGQz1qRCVcAYMeBTuBLDILfZ9XGAuILt/kyEPJSc6hVIywcppyOZ+d1od KHsL7ITmy8Xud6YQnZqXL+YNHfkEhyIt+36ZqJ0vHpDP67nPwG8MZR34OcWgp5NcJ+eJBN pmmrnZxvoXNkY7ftHep9SC7Quq9XbJsqBjPIZgNCpd6HsGohUouI0CFJAOznqjKWkLZMtL mhehQDNri/FljyHStihRo1TAbaZBDSfuyvCHR+5eSyKDcBqGRfxxfHdNunysYyFl2EcxXu XvYXOM2MCb5Iia/EedM/4TO2Tlaw+LchUkQt2G0GVFHJr3ndUxM5NxmkP9VNVQ== 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 4S1c8z6t8pz1QtR; Thu, 5 Oct 2023 16:15:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 395GFFER081636; Thu, 5 Oct 2023 16:15:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 395GFF4b081633; Thu, 5 Oct 2023 16:15:15 GMT (envelope-from git) Date: Thu, 5 Oct 2023 16:15:15 GMT Message-Id: <202310051615.395GFF4b081633@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Somers Subject: git: 6a773a0582ba - main - fusefs: add more readdir tests for misbehaving servers 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: 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/main X-Git-Reftype: branch X-Git-Commit: 6a773a0582ba936cc19734b21ee5a7bed49cfdec Auto-Submitted: auto-generated The branch main has been updated by asomers: URL: https://cgit.FreeBSD.org/src/commit/?id=6a773a0582ba936cc19734b21ee5a7bed49cfdec commit 6a773a0582ba936cc19734b21ee5a7bed49cfdec Author: Alan Somers AuthorDate: 2023-10-05 16:13:05 +0000 Commit: Alan Somers CommitDate: 2023-10-05 16:15:03 +0000 fusefs: add more readdir tests for misbehaving servers Inspired by PR 274268 MFC after: 2 weeks Sponsored by: Axcient --- tests/sys/fs/fusefs/readdir.cc | 87 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 87 insertions(+) diff --git a/tests/sys/fs/fusefs/readdir.cc b/tests/sys/fs/fusefs/readdir.cc index 5fd8f25e8bb7..6b78e3a70697 100644 --- a/tests/sys/fs/fusefs/readdir.cc +++ b/tests/sys/fs/fusefs/readdir.cc @@ -321,6 +321,50 @@ TEST_F(Readdir, nodots) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded NUL. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, nul) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char nul[] = "foo\0bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(nul); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, nul, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(nul), de->d_namlen); + EXPECT_EQ(0, strcmp(nul, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + + /* telldir(3) and seekdir(3) should work with fuse */ TEST_F(Readdir, seekdir) { @@ -397,6 +441,49 @@ TEST_F(Readdir, seekdir) leakdir(dir); } +/* + * FUSE_READDIR returns a path with an embedded /. Obviously illegal, but + * nothing bad should happen. + */ +TEST_F(Readdir, slash) +{ + const char FULLPATH[] = "mountpoint/some_dir"; + const char RELPATH[] = "some_dir"; + uint64_t ino = 42; + DIR *dir; + struct dirent *de; + vector ents(1); + vector empty_ents(0); + const char foobar[] = "foo/bar"; + + expect_lookup(RELPATH, ino); + expect_opendir(ino); + ents[0].d_fileno = 4; + ents[0].d_off = 4000; + ents[0].d_namlen = sizeof(foobar); + ents[0].d_type = DT_REG; + strncpy(ents[0].d_name, foobar, ents[0].d_namlen); + expect_readdir(ino, 0, ents); + expect_readdir(ino, 4000, empty_ents); + + errno = 0; + dir = opendir(FULLPATH); + ASSERT_NE(nullptr, dir) << strerror(errno); + + errno = 0; + de = readdir(dir); + ASSERT_NE(nullptr, de) << strerror(errno); + EXPECT_EQ(4ul, de->d_fileno); + EXPECT_EQ(DT_REG, de->d_type); + EXPECT_EQ(sizeof(foobar), de->d_namlen); + EXPECT_EQ(0, strcmp(foobar, de->d_name)); + + ASSERT_EQ(nullptr, readdir(dir)); + ASSERT_EQ(0, errno); + + leakdir(dir); +} + TEST_F(Readdir_7_8, nodots) { const char FULLPATH[] = "mountpoint/some_dir";