ubifs, race between link and unlink/rename?
Subsystems (2)
Hello,
Is there a race condition in ubifs?
Here is a scenario.
Process A Process B
----------------------+---------------------------create("dirA/fileA"); |
unlink("dirA/fileA"); | link("dirA/fileA", "dirB/fileB");
| unlink("dirB/fileB");----------------------+---------------------------
In link(2), dirA->i_mutex is not held. So unlink("dirA/fileA") can run concurrently (after lookup).
While ubifs acquires ubifs_inode->ui_mutex, it doesn't check i_nlink. When unlink("dirA/fileA") wins ui_mutex race and link() loses,
- ubifs_unlink("dirA/fileA") will call ubifs_jnl_update/ubifs_add_orphan()
- ubifs_link() will operate the inode with i_nlink == 0 (finally it will be 1)
- ubifs_unlink("dirB/fileB") will call ubifs_add_orphan() again for the same inode
- and it will produce "orphaned twice" error.
- (ubifs_add_orphan() is called by ubifs_rename/ubifs_jnl_rename() too)
If this scenario is possible, it may happen in every FS.
To check i_nlink in vfs_link (like this) may be one option, but it might be better to check in ubifs since ubifs_add_orphan() is for i_nlink == 0 and ubifs specific.
fs/namei.c +5 -2
@@ -2409,9 +2409,12 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_deif (error)return error; + error = -ENOENT ;mutex_lock (&inode->i_mutex); -DQUOT_INIT (dir); - error = dir->i_op->link (old_dentry, dir, new_dentry); +if (inode->i_nlink) { +DQUOT_INIT (dir); + error = dir->i_op->link (old_dentry, dir, new_dentry); + }mutex_unlock (&inode->i_mutex);if (!error)fsnotify_link (dir, inode, new_dentry);
J. R. Okajima
Quoted 1 line · [email protected] wrote:
Is there a race condition in ubifs?
Yes, it does look like it. EXT3 and EXT4 explicitly check for nlink == 0 in their link functions. UBIFS seems to have overlooked that check.
I guess some file systems do not have a problem with the race, which is why VFS allows it. We will patch UBIFS, but I cannot comment about changing VFS.
Thank you for finding this :-)
Quoted 49 lines
Here is a scenario.
Process A Process B
----------------------+---------------------------create("dirA/fileA"); |unlink("dirA/fileA"); | link("dirA/fileA", "dirB/fileB"); | unlink("dirB/fileB");----------------------+---------------------------
In link(2),
dirA->i_mutexis not held. Sounlink("dirA/fileA")can run concurrently (after lookup).
While ubifs acquiresubifs_inode->ui_mutex, it doesn't checki_nlink. Whenunlink("dirA/fileA")winsui_mutexrace andlink()loses,
-ubifs_unlink("dirA/fileA")will call ubifs_jnl_update/ubifs_add_orphan()
-ubifs_link()will operate the inode withi_nlink== 0 (finally it will be 1)
-ubifs_unlink("dirB/fileB")will callubifs_add_orphan()again for the same inode
- and it will produce "orphaned twice" error.
- (ubifs_add_orphan()is called by ubifs_rename/ubifs_jnl_rename() too)If this scenario is possible, it may happen in every FS.
To checki_nlinkinvfs_link(like this) may be one option, but it might be better to check in ubifs sinceubifs_add_orphan()is fori_nlink== 0 and ubifs specific.fs/namei.c +5
-2@@ -2409,9 +2409,12 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_deif (error)return error; + error = -ENOENT ;mutex_lock (&inode->i_mutex); -DQUOT_INIT (dir); - error = dir->i_op->link (old_dentry, dir, new_dentry); +if (inode->i_nlink) { +DQUOT_INIT (dir); + error = dir->i_op->link (old_dentry, dir, new_dentry); + }mutex_unlock (&inode->i_mutex);if (!error)fsnotify_link (dir, inode, new_dentry);J. R. Okajima
Quoted 10 lines · On Thu, 2009-05-14 at 01:31 +0900, [email protected] wrote:
fs/namei.c +1
-0@@ -2409,9 +2409,12 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_deif (error)return error; + error = -ENOENT ;
fs/namei.c int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de · line 2420
Quoted 10 lines
fs/namei.c +4
-2mutex_lock (&inode->i_mutex); -DQUOT_INIT (dir); - error = dir->i_op->link (old_dentry, dir, new_dentry); +if (inode->i_nlink) { +DQUOT_INIT (dir); + error = dir->i_op->link (old_dentry, dir, new_dentry); + }mutex_unlock (&inode->i_mutex);if (!error)fsnotify_link (dir, inode, new_dentry);
Looks correct to me. I wonder what VFS guys think - should we fix UBIFS or this can be done at the VFS layer?
Signature · 7 lines
Best regards, Artem Bityutskiy (Битюцкий Артём) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 11 lines · On Thu, 2009-05-14 at 01:31 +0900, [email protected] wrote:
Hello,
Is there a race condition in ubifs?
Here is a scenario.Process A Process B
----------------------+---------------------------create("dirA/fileA"); |unlink("dirA/fileA"); | link("dirA/fileA", "dirB/fileB"); | unlink("dirB/fileB");----------------------+---------------------------
From: Hunter Adrian <[email protected]>
Date: Thu, 14 May 2009 06:32:30 +0200
Subject: [PATCH] UBIFS: return error if link and unlink race
Consider a scenario when 'vfs_link(dirA/fileA)' and 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not lock 'dirA->i_mutex', so this is possible. Both of the functions lock 'fileA->i_mutex' though. Suppose 'vfs_unlink()' wins, and takes 'fileA->i_mutex' mutex first. Suppose 'fileA->i_nlink' is 1. In this case 'ubifs_unlink()' will drop the last reference, and put 'inodeA' to the list of orphans. After this, 'vfs_link()' will link 'dirB/fileB' to 'inodeA'. Thir is a problem because, for example, the subsequent 'vfs_unlink(dirB/fileB)' will add the same inode to the list of orphans.
This problem was reported by J. R. Okajima <[email protected]>
[Artem: add more comments, amended commit message]
--- fs/ubifs/dir.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-)
fs/ubifs/dir.c +19 -0
@@ -528,6 +528,25 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, inode->i_nlink, dir->i_ino);ubifs_assert (mutex_is_locked (&dir->i_mutex));ubifs_assert (mutex_is_locked (&inode->i_mutex)); + +/* +* Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing +* otherwise has the potential to corrupt the orphan inode list. +* +* Indeed, consider a scenario when 'vfs_link(dirA/fileA)' and +* 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not +* lock 'dirA->i_mutex', so this is possible. Both of the functions +* lock 'fileA->i_mutex' though. Suppose 'vfs_unlink()' wins, and takes +* 'fileA->i_mutex' mutex first. Suppose 'fileA->i_nlink' is 1. In this +* case 'ubifs_unlink()' will drop the last reference, and put 'inodeA' +* to the list of orphans. After this, 'vfs_link()' will link +* 'dirB/fileB' to 'inodeA'. This is a problem because, for example, +* the subsequent 'vfs_unlink(dirB/fileB)' will add the same inode +* to the list of orphans. +*/ +if (inode->i_nlink ==0 ) +return -ENOENT ; + err =dbg_check_synced_i_size (inode);if (err)return err;
Signature · 10 lines
1.6.0.6 -- Best regards, Artem Bityutskiy (Битюцкий Артём) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 28 lines · Artem Bityutskiy
Quoted 11 lines · On Thu, 2009-05-14 at 01:31 +0900, [email protected] wrote:
Hello,
Is there a race condition in ubifs?
Here is a scenario.Process A Process B
----------------------+---------------------------create("dirA/fileA"); |unlink("dirA/fileA"); | link("dirA/fileA", "dirB/fileB"); | unlink("dirB/fileB");----------------------+---------------------------
From: Hunter Adrian <[email protected]>
Date: Thu, 14 May 2009 06:32:30 +0200
Subject: [PATCH] UBIFS: return error if link and unlink raceConsider a scenario when '
vfs_link(dirA/fileA)' and 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not lock 'dirA->i_mutex', so this is possible. Both of the functions lock 'fileA->i_mutex' though. Suppose 'vfs_unlink()' wins, and takes 'fileA->i_mutex' mutex first. Suppose 'fileA->i_nlink' is 1. In this case 'ubifs_unlink()' will drop the last reference, and put 'inodeA' to the list of orphans. After this, 'vfs_link()' will link 'dirB/fileB' to 'inodeA'. Thir is a problem because, for example, the subsequent 'vfs_unlink(dirB/fileB)' will add the same inode to the list of orphans.
Quoted 7 lines
This problem was reported by J. R. Okajima <[email protected]>
[Artem: add more comments, amended commit message]
Signed-off-by Adrian Hunter <[email protected]>Signed-off-by Artem Bityutskiy <[email protected]>---
Pushing this patch to ubifs-2.6.git, thanks.
Signature · 7 lines
Best regards, Artem Bityutskiy (Битюцкий Артём) -- To unsubscribe from this list: send the line "unsubscribe linux-fsdevel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Artem Bityutskiy:
Quoted 3 lines
Quoted 3 lines
Consider a scenario when '
vfs_link(dirA/fileA)' and 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not lock 'dirA->i_mutex', so this is possible. Both of the functions
:::
Quoted 1 line
Pushing this patch to ubifs-2.6.git, thanks.
Ah, I am late.
We need one minor correction.
fs/ubifs/dir.c static int ubifs_link(struct dentry *old_dentry, struct inode *dir, · line 537
Quoted 11 lines
fs/ubifs/dir.c +7
-0@@ -528,6 +528,25 @@ static int ubifs_link(struct dentry *old_dentry, struct inode *dir, inode->i_nlink, dir->i_ino);ubifs_assert (mutex_is_locked (&dir->i_mutex));ubifs_assert (mutex_is_locked (&inode->i_mutex)); + +/* +* Return -ENOENT if we've raced with unlink and i_nlink is 0. Doing +* otherwise has the potential to corrupt the orphan inode list. +* +* Indeed, consider a scenario when 'vfs_link(dirA/fileA)' and +* 'vfs_unlink(dirA/fileA, dirB/fileB)' race. 'vfs_link()' does not
This comment is confusing.
Need to swich vfs_unlink and vfs_link. :-)
J. R. Okajima