Commit b928095b0a7cff7fb9fcf4c706348ceb8ab2c295
Committed by
Al Viro
1 parent
0f33be009b
Exists in
ti-lsk-linux-4.1.y
and in
10 other branches
shmem: fix nlink for rename overwrite directory
If overwriting an empty directory with rename, then need to drop the extra nlink. Test prog: #include <stdio.h> #include <fcntl.h> #include <err.h> #include <sys/stat.h> int main(void) { const char *test_dir1 = "test-dir1"; const char *test_dir2 = "test-dir2"; int res; int fd; struct stat statbuf; res = mkdir(test_dir1, 0777); if (res == -1) err(1, "mkdir(\"%s\")", test_dir1); res = mkdir(test_dir2, 0777); if (res == -1) err(1, "mkdir(\"%s\")", test_dir2); fd = open(test_dir2, O_RDONLY); if (fd == -1) err(1, "open(\"%s\")", test_dir2); res = rename(test_dir1, test_dir2); if (res == -1) err(1, "rename(\"%s\", \"%s\")", test_dir1, test_dir2); res = fstat(fd, &statbuf); if (res == -1) err(1, "fstat(%i)", fd); if (statbuf.st_nlink != 0) { fprintf(stderr, "nlink is %lu, should be 0\n", statbuf.st_nlink); return 1; } return 0; } Signed-off-by: Miklos Szeredi <mszeredi@suse.cz> Cc: stable@vger.kernel.org Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Showing 1 changed file with 3 additions and 1 deletions Side-by-side Diff
mm/shmem.c
... | ... | @@ -2367,8 +2367,10 @@ |
2367 | 2367 | |
2368 | 2368 | if (new_dentry->d_inode) { |
2369 | 2369 | (void) shmem_unlink(new_dir, new_dentry); |
2370 | - if (they_are_dirs) | |
2370 | + if (they_are_dirs) { | |
2371 | + drop_nlink(new_dentry->d_inode); | |
2371 | 2372 | drop_nlink(old_dir); |
2373 | + } | |
2372 | 2374 | } else if (they_are_dirs) { |
2373 | 2375 | drop_nlink(old_dir); |
2374 | 2376 | inc_nlink(new_dir); |
-
mentioned in commit e47c22
-
mentioned in commit e47c22
-
mentioned in commit e47c22
-
mentioned in commit e47c22
-
mentioned in commit e47c22