vfs: fix bug when opening a file with O_DIRECT on a file system that does not support it will leave an empty file
PATCH 1/1 vfs: fix bug when opening a file with O_DIRECT on a file system that does not support it will leave an empty file
Colin Ian King reported the following
1. create a minix file system and mount it
2. open a file on the file system with O_RDWR | O_CREAT | O_TRUNC | O_DIRECT
3. open fails with -EINVAL but leaves an empty file behind. All other open() failures don't leave the failed open files behind.
The reason is because when checking the O_DIRECT in do_dentry_open, the inode has created, and later err processing can't remove the inode:
/* NB: we're sure to have correct a_ops only after f_op->open */
if (f->f_flags & O_DIRECT) {
if (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO)
return -EINVAL;
}The patch will check the O_DIRECT before creating the inode in lookup_open function.
--- fs/namei.c | 7 +++++++ fs/open.c | 6 ------ 2 files changed, 7 insertions(+), 6 deletions(-)
fs/namei.c +7 -0
@@ -3277,6 +3277,13 @@ static struct dentry *lookup_open(struct nameidata *nd, struct file *file, goto out_dput; } +if (open_flag &O_DIRECT ) { +if (!dir_inode->i_mapping || !dir_inode->i_mapping->a_ops || + !dir_inode->i_mapping->a_ops->direct_IO) { + error = -EINVAL ; + goto out_dput; + } + } error = dir_inode->i_op->create (mnt_userns, dir_inode, dentry, mode, open_flag &O_EXCL );if (error)
fs/open.c +0 -6
@@ -838,12 +838,6 @@ static int do_dentry_open(struct file *f,file_ra_state_init (&f->f_ra, f->f_mapping->host->i_mapping); -/* NB: we're sure to have correct a_ops only after f_op->open */ -if (f->f_flags &O_DIRECT ) { -if (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO) -return -EINVAL ; - } -/* * XXX: Huge page cache doesn't support writing yet. Drop all page * cache for this file before processing writes.
Signature · 1 line
2.30.2
Al Viro
maintainerQuoted 10 lines · Qinghua Jin
Colin Ian King reported the following
1. create a minix file system and mount it
2. open a file on the file system withO_RDWR|O_CREAT|O_TRUNC|O_DIRECT
3. open fails with-EINVALbut leaves an empty file behind. All otheropen()failures don't leave the failed open files behind.The reason is because when checking the
O_DIRECTindo_dentry_open, the inode has created, and later err processing can't remove the inode:
Quoted 7 lines
/* NB: we're sure to have correct a_ops only after f_op->open */ if (f->f_flags & O_DIRECT) { if (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO) return -EINVAL; }The patch will check the
O_DIRECTbefore creating the inode inlookup_openfunction.
NAK. You are looking at ->a_ops of the parent directory. Which might have nothing whatsoever to do with that of a regular file created in it.
IOW, you've removed the check on the file we are opening and replaced it with random check that just happens to yield negative on minixfs.