diff options
author | Richard Weinberger <richard@nod.at> | 2017-03-30 04:50:49 -0400 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2017-04-18 17:18:02 -0400 |
commit | 32fe905c17f001c0eee13c59afddd0bf2eed509c (patch) | |
tree | 2189b2fd37cf9faf6ca930581ae0c21c5fb1ab65 /fs | |
parent | c3d9fda688742c06e89aa1f0f8fd943fc11468cb (diff) |
ubifs: Fix O_TMPFILE corner case in ubifs_link()
It is perfectly fine to link a tmpfile back using linkat().
Since tmpfiles are created with a link count of 0 they appear
on the orphan list, upon re-linking the inode has to be removed
from the orphan list again.
Ralph faced a filesystem corruption in combination with overlayfs
due to this bug.
Cc: <stable@vger.kernel.org>
Cc: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Cc: Amir Goldstein <amir73il@gmail.com>
Reported-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Tested-by: Ralph Sennhauser <ralph.sennhauser@gmail.com>
Reported-by: Amir Goldstein <amir73il@gmail.com>
Fixes: 474b93704f321 ("ubifs: Implement O_TMPFILE")
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/ubifs/dir.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c index 0858213a4e63..b777bddaa1dd 100644 --- a/fs/ubifs/dir.c +++ b/fs/ubifs/dir.c | |||
@@ -748,6 +748,11 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, | |||
748 | goto out_fname; | 748 | goto out_fname; |
749 | 749 | ||
750 | lock_2_inodes(dir, inode); | 750 | lock_2_inodes(dir, inode); |
751 | |||
752 | /* Handle O_TMPFILE corner case, it is allowed to link a O_TMPFILE. */ | ||
753 | if (inode->i_nlink == 0) | ||
754 | ubifs_delete_orphan(c, inode->i_ino); | ||
755 | |||
751 | inc_nlink(inode); | 756 | inc_nlink(inode); |
752 | ihold(inode); | 757 | ihold(inode); |
753 | inode->i_ctime = ubifs_current_time(inode); | 758 | inode->i_ctime = ubifs_current_time(inode); |
@@ -768,6 +773,8 @@ out_cancel: | |||
768 | dir->i_size -= sz_change; | 773 | dir->i_size -= sz_change; |
769 | dir_ui->ui_size = dir->i_size; | 774 | dir_ui->ui_size = dir->i_size; |
770 | drop_nlink(inode); | 775 | drop_nlink(inode); |
776 | if (inode->i_nlink == 0) | ||
777 | ubifs_add_orphan(c, inode->i_ino); | ||
771 | unlock_2_inodes(dir, inode); | 778 | unlock_2_inodes(dir, inode); |
772 | ubifs_release_budget(c, &req); | 779 | ubifs_release_budget(c, &req); |
773 | iput(inode); | 780 | iput(inode); |