This is the mail archive of the
cygwin-patches
mailing list for the Cygwin project.
[PATCH v2] Cygwin: rmdir: fail if last component is a symlink, as on Linux
- From: Ken Brown <kbrown at cornell dot edu>
- To: "cygwin-patches at cygwin dot com" <cygwin-patches at cygwin dot com>
- Cc: "eblake at redhat dot com" <eblake at redhat dot com>
- Date: Tue, 24 Sep 2019 17:55:47 +0000
- Subject: [PATCH v2] Cygwin: rmdir: fail if last component is a symlink, as on Linux
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=cornell.edu; dmarc=pass action=none header.from=cornell.edu; dkim=pass header.d=cornell.edu; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ZLpkxX8yiZGHQfTQfmcj3BKHhjSLxB68DJL7KX0L15w=; b=IUMW4pRoJ+/TXYZoNeFuuyTxniJOuPx7k2YHXeeCmvoEGBdmLnbyuMFahp8Fj7CcOMgI9Op09rY8IAH7lepVNOT4d9UJcyyYR7WRzo6BsUa4M8xZtbxdYtf0Ccbav8onCwqzuf76bxascQT36DdDb2RYorZocprWuxEFfUZ1PQMM2a3ba8/OyEnjmPNQDfRMlyppo5f84u3IVAHrjfwSFa/1GtVamtMbkWm3k0fYtBRUJP734YwQNjd1/6KKWuf38SDXhRTHenVU0k1DgRnWjXofOcx1L17RkpUOMitb2/TLAk7NX8eXECwB0iSv2GLsOIcEJWS+DFBy01r0+xCdYQ==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=QsbHv/5vV6EH0Ca5rrzV3+HW4JDeb2g5JpTsMI85J/cesOttBxSAGHs13CUFK0KYdVNKwJNDvGRI4xvrSBEMmkO7VAN1pP3TQftRcmtkjObUaLtLdOi82CGnvS2dHF+lWokyyemxu3KmL90GoUjzsZimM7XFSJEeiQpx4K0sqSuEA4/U1T5pu52y3EJE5QFHVY1nQ0IeUvSsxb8sx0W9uH65oKNfwVWP8WdsR3cETwgU31bjVkFpCyUUTqvO2yB77UPkUbAbP+wWOgsJvh76Q8FXV8GurLUTT7QPWm44P5Km/Z3ybdyRE682yYYOptsmoJ6RkTZ11FdnCRkErGXp7g==
If the last component of the directory name is a symlink followed by a
slash, rmdir should fail, even if the symlink resolves to an existing
empty directory.
mkdir was similarly fixed in 2009 in commit
52dba6a5c45e8d8ba1e237a15213311dc11d91fb. Modify a comment to clarify
the purpose of that commit.
Addresses https://cygwin.com/ml/cygwin/2019-09/msg00221.html.
---
winsup/cygwin/dir.cc | 27 +++++++++++++++++++++++----
1 file changed, 23 insertions(+), 4 deletions(-)
diff --git a/winsup/cygwin/dir.cc b/winsup/cygwin/dir.cc
index b757851d5..0e0535891 100644
--- a/winsup/cygwin/dir.cc
+++ b/winsup/cygwin/dir.cc
@@ -305,15 +305,14 @@ mkdir (const char *dir, mode_t mode)
__try
{
- /* POSIX says mkdir("symlink-to-missing/") should create the
- directory "missing", but Linux rejects it with EEXIST. Copy
- Linux behavior for now. */
-
if (!*dir)
{
set_errno (ENOENT);
__leave;
}
+ /* Following Linux, do not resolve the last component of DIR if
+ it is a symlink, even if DIR has a trailing slash. Achieve
+ this by stripping trailing slashes or backslashes. */
if (isdirsep (dir[strlen (dir) - 1]))
{
/* This converts // to /, but since both give EEXIST, we're okay. */
@@ -351,9 +350,29 @@ rmdir (const char *dir)
{
int res = -1;
fhandler_base *fh = NULL;
+ tmp_pathbuf tp;
__try
{
+ if (!*dir)
+ {
+ set_errno (ENOENT);
+ __leave;
+ }
+
+ /* Following Linux, do not resolve the last component of DIR if
+ it is a symlink, even if DIR has a trailing slash. Achieve
+ this by stripping trailing slashes or backslashes. */
+ if (isdirsep (dir[strlen (dir) - 1]))
+ {
+ /* This converts // to /, but since both give ENOTEMPTY,
+ we're okay. */
+ char *buf;
+ char *p = stpcpy (buf = tp.c_get (), dir) - 1;
+ dir = buf;
+ while (p > dir && isdirsep (*p))
+ *p-- = '\0';
+ }
if (!(fh = build_fh_name (dir, PC_SYM_NOFOLLOW)))
__leave; /* errno already set */;
--
2.21.0