smb: client: fix race with concurrent opens in unlink(2)
Subsystems (2)
Paulo Alcantara
maintainerPATCH 1/2 smb: client: fix race with concurrent opens in unlink(2)
According to some logs reported by customers, CIFS client might end up reporting unlinked files as existing in stat(2) due to concurrent opens racing with unlink(2).
Besides sending the removal request to the server, the unlink process could involve closing any deferred close as well as marking all existing open handles as deleted to prevent them from deferring closes, which increases the race window for potential concurrent opens.
Fix this by unhashing the dentry in cifs_unlink() to prevent any subsequent opens. Any open attempts, while we're still unlinking, will block on parent's i_rwsem.
--- fs/smb/client/inode.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
fs/smb/client/inode.c +15 -3
@@ -1943,15 +1943,24 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)struct cifs_sb_info *cifs_sb =CIFS_SB (sb);struct tcon_link *tlink;struct cifs_tcon *tcon; -struct TCP_Server_Info *server; -struct iattr *attrs =NULL ;__u32 dosattr =0 , origattr =0 ; +struct TCP_Server_Info *server; +struct iattr *attrs =NULL ; +bool rehash = false;cifs_dbg (FYI ,"cifs_unlink, dir=0x%p, dentry=0x%p\n" , dir, dentry);if (unlikely (cifs_forced_shutdown (cifs_sb)))return -EIO ; +/* Unhash dentry in advance to prevent any concurrent opens */ +spin_lock (&dentry->d_lock); +if (!d_unhashed (dentry)) { +__d_drop (dentry); + rehash = true; + } +spin_unlock (&dentry->d_lock); + tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))return PTR_ERR (tlink);
@@ -2003,7 +2012,8 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)cifs_drop_nlink (inode); } }else if (rc == -ENOENT ) { -d_drop (dentry); +if (simple_positive (dentry)) +d_delete (dentry); }else if (rc == -EBUSY ) {if (server->ops->rename_pending_delete) { rc = server->ops->rename_pending_delete(full_path,
@@ -2056,6 +2066,8 @@ int cifs_unlink(struct inode *dir, struct dentry *dentry)kfree (attrs);free_xid (xid);cifs_put_tlink (tlink); +if (rehash) +d_rehash (dentry);return rc; }
Signature · 1 line
2.50.1
Paulo Alcantara
maintainerPATCH 2/2 smb: client: fix race with concurrent opens in rename(2)
Besides sending the rename request to the server, the rename process also involves closing any deferred close, waiting for outstanding I/O to complete as well as marking all existing open handles as deleted to prevent them from deferring closes, which increases the race window for potential concurrent opens on the target file.
Fix this by unhashing the dentry in advance to prevent any concurrent opens on the target.
--- fs/smb/client/inode.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+)
fs/smb/client/inode.c +17 -0
@@ -2469,11 +2469,13 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir, struct dentry *source_dentry, struct inode *target_dir, struct dentry *target_dentry, unsigned int flags) { + struct inode *target_inode = d_inode(target_dentry);const char *from_name, *to_name;void *page1, *page2;struct cifs_sb_info *cifs_sb;struct tcon_link *tlink;struct cifs_tcon *tcon; +bool rehash = false;unsigned int xid;int rc, tmprc;int retry_count =0 ;
@@ -2489,6 +2491,19 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,if (unlikely (cifs_forced_shutdown (cifs_sb)))return -EIO ; +/* +* Prevent any concurrent opens on the target by unhashing the dentry. +* VFS already unhashes the target when renaming directories. +*/ +if (target_inode && !S_ISDIR (target_inode->i_mode)) { +spin_lock (&target_dentry->d_lock); +if (!d_unhashed (target_dentry)) { +__d_drop (target_dentry); + rehash = true; + } +spin_unlock (&target_dentry->d_lock); + } + tlink =cifs_sb_tlink (cifs_sb);if (IS_ERR (tlink))return PTR_ERR (tlink);
@@ -2599,6 +2614,8 @@ cifs_rename2(struct mnt_idmap *idmap, struct inode *source_dir,free_dentry_path (page1);free_xid (xid);cifs_put_tlink (tlink); +if (rehash) +d_rehash (target_dentry);return rc; }
Signature · 1 line
2.50.1