mirrors/gcc
1
0
Fork 0
mirror of https://gcc.gnu.org/git/gcc.git synced 2024-11-23 19:03:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

libstdc++: Handle EMLINK and EFTYPE in std::filesystem::remove_all

Browse Source 
Although POSIX requires ELOOP, FreeBSD documents that openat with
O_NOFOLLOW returns EMLINK if the last component of a filename is a
symbolic link.  Check for EMLINK as well as ELOOP, so that the TOCTTOU
mitigation in remove_all works correctly.

See https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=214633 or the
FreeBSD man page for reference.

According to its man page, DragonFlyBSD also uses EMLINK for this error,
and NetBSD uses its own EFTYPE. OpenBSD follows POSIX and uses EMLINK.

This fixes these failures on FreeBSD:
FAIL: 27_io/filesystem/operations/remove_all.cc  -std=gnu++17 execution test
FAIL: experimental/filesystem/operations/remove_all.cc  -std=gnu++17 execution test

libstdc++-v3/ChangeLog:

	* src/c++17/fs_ops.cc (remove_all) [__FreeBSD__ || __DragonFly__]:
	Check for EMLINK as well as ELOOP.
	[__NetBSD__]: Check for EFTYPE as well as ELOOP.
This commit is contained in:
Jonathan Wakely 2024-04-08 17:41:00 +01:00
parent 1f655ef436
commit 135be552d1
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libstdc++-v3/src/c++17/fs_ops.cc
View File

@ -1310,7 +1310,13 @@ fs::remove_all(const path& p)
// Our work here is done.
return 0;
case ENOTDIR:
case ELOOP:
case ELOOP: // POSIX says openat with O_NOFOLLOW sets ELOOP for a symlink.
#if defined __FreeBSD__ || defined __DragonFly__
case EMLINK: // Used instead of ELOOP
#endif
#if defined __NetBSD__ && defined EFTYPE
case EFTYPE: // Used instead of ELOOP
#endif
// Not a directory, will remove below.
break;
#endif
@ -1350,7 +1356,13 @@ fs::remove_all(const path& p, error_code& ec)
ec.clear();
return 0;
case ENOTDIR:
case ELOOP:
case ELOOP: // POSIX says openat with O_NOFOLLOW sets ELOOP for a symlink.
#if defined __FreeBSD__ || defined __DragonFly__
case EMLINK: // Used instead of ELOOP
#endif
#if defined __NetBSD__ && defined EFTYPE
case EFTYPE: // Used instead of ELOOP
#endif
// Not a directory, will remove below.
break;
#endif