diff options
| -rw-r--r-- | NEWS | 6 | ||||
| -rw-r--r-- | src/chmod.c | 10 |
2 files changed, 15 insertions, 1 deletions
@@ -2,6 +2,12 @@ GNU coreutils NEWS -*- outline -*- * Noteworthy changes in release ?.? (????-??-??) [?] +** Bug fixes + + When recursing, chmod -R no longer gets confused into following a symlink + if some other process simultaneously replaces a non-symlink with a symlink. + The fix is effective on modern hosts with the fchmodat or lchmod syscalls. + [bug introduced in the beginning] * Noteworthy changes in release 8.16 (2012-03-26) [stable] diff --git a/src/chmod.c b/src/chmod.c index aa4ac771c..2e1f1c70b 100644 --- a/src/chmod.c +++ b/src/chmod.c @@ -268,7 +268,15 @@ process_file (FTS *fts, FTSENT *ent) if (! S_ISLNK (old_mode)) { - if (chmodat (fts->fts_cwd_fd, file, new_mode) == 0) + /* Use any native support for AT_SYMLINK_NOFOLLOW, to avoid + following a symlink if there is a race. */ + #if HAVE_FCHMODAT || HAVE_LCHMOD + int follow_flag = AT_SYMLINK_NOFOLLOW; + #else + int follow_flag = 0; + #endif + + if (fchmodat (fts->fts_cwd_fd, file, new_mode, follow_flag) == 0) chmod_succeeded = true; else { |