瀏覽代碼

do_dentry_open(): close the race with mark_files_ro() in failure exit

we want to take it out of mark_files_ro() reach *before* we start
checking if we ought to drop write access.

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Al Viro 13 年之前
父節點
當前提交
c3c4f69424
共有 1 個文件被更改,包括 1 次插入1 次删除
  1. 1 1
      fs/open.c

+ 1 - 1
fs/open.c

@@ -727,6 +727,7 @@ static int do_dentry_open(struct file *f,
 
 
 cleanup_all:
 cleanup_all:
 	fops_put(f->f_op);
 	fops_put(f->f_op);
+	file_sb_list_del(f);
 	if (f->f_mode & FMODE_WRITE) {
 	if (f->f_mode & FMODE_WRITE) {
 		put_write_access(inode);
 		put_write_access(inode);
 		if (!special_file(inode->i_mode)) {
 		if (!special_file(inode->i_mode)) {
@@ -740,7 +741,6 @@ cleanup_all:
 			mnt_drop_write(f->f_path.mnt);
 			mnt_drop_write(f->f_path.mnt);
 		}
 		}
 	}
 	}
-	file_sb_list_del(f);
 cleanup_file:
 cleanup_file:
 	path_put(&f->f_path);
 	path_put(&f->f_path);
 	f->f_path.mnt = NULL;
 	f->f_path.mnt = NULL;