* [PATCH] fs: fold open_check_o_direct into do_dentry_open
@ 2018-03-20 10:30 Christoph Hellwig
2018-04-25 15:03 ` J. R. Okajima
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2018-03-20 10:30 UTC (permalink / raw)
To: viro; +Cc: linux-fsdevel
do_dentry_open is where we do the actual open of the file, so this is
where we should do our O_DIRECT sanity check to cover all potential
callers.
Signed-off-by: Christoph Hellwig <hch@lst.de>
---
fs/internal.h | 1 -
fs/namei.c | 7 +------
fs/open.c | 44 ++++++++++++++++++--------------------------
3 files changed, 19 insertions(+), 33 deletions(-)
diff --git a/fs/internal.h b/fs/internal.h
index df262f41a0ef..5e797281d941 100644
--- a/fs/internal.h
+++ b/fs/internal.h
@@ -111,7 +111,6 @@ extern struct file *do_filp_open(int dfd, struct filename *pathname,
extern struct file *do_file_open_root(struct dentry *, struct vfsmount *,
const char *, const struct open_flags *);
-extern int open_check_o_direct(struct file *f);
extern int vfs_open(const struct path *, struct file *, const struct cred *);
extern struct file *filp_clone_open(struct file *);
diff --git a/fs/namei.c b/fs/namei.c
index 920a828ab2ce..9d6d8e8aed55 100644
--- a/fs/namei.c
+++ b/fs/namei.c
@@ -3374,9 +3374,7 @@ static int do_last(struct nameidata *nd,
goto out;
*opened |= FILE_OPENED;
opened:
- error = open_check_o_direct(file);
- if (!error)
- error = ima_file_check(file, op->acc_mode, *opened);
+ error = ima_file_check(file, op->acc_mode, *opened);
if (!error && will_truncate)
error = handle_truncate(file);
out:
@@ -3456,9 +3454,6 @@ static int do_tmpfile(struct nameidata *nd, unsigned flags,
error = finish_open(file, child, NULL, opened);
if (error)
goto out2;
- error = open_check_o_direct(file);
- if (error)
- fput(file);
out2:
mnt_drop_write(path.mnt);
out:
diff --git a/fs/open.c b/fs/open.c
index 7ea118471dce..f587f3dbfc7f 100644
--- a/fs/open.c
+++ b/fs/open.c
@@ -682,16 +682,6 @@ SYSCALL_DEFINE3(fchown, unsigned int, fd, uid_t, user, gid_t, group)
return error;
}
-int open_check_o_direct(struct file *f)
-{
- /* 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;
- }
- return 0;
-}
-
static int do_dentry_open(struct file *f,
struct inode *inode,
int (*open)(struct inode *, struct file *),
@@ -713,7 +703,7 @@ static int do_dentry_open(struct file *f,
if (unlikely(f->f_flags & O_PATH)) {
f->f_mode = FMODE_PATH;
f->f_op = &empty_fops;
- return 0;
+ goto done;
}
if (f->f_mode & FMODE_WRITE && !special_file(inode->i_mode)) {
@@ -766,7 +756,12 @@ static int do_dentry_open(struct file *f,
f->f_flags &= ~(O_CREAT | O_EXCL | O_NOCTTY | O_TRUNC);
file_ra_state_init(&f->f_ra, f->f_mapping->host->i_mapping);
-
+done:
+ /* NB: we're sure to have correct a_ops only after f_op->open */
+ error = -EINVAL;
+ if ((f->f_flags & O_DIRECT) &&
+ (!f->f_mapping->a_ops || !f->f_mapping->a_ops->direct_IO))
+ goto out_fput;
return 0;
cleanup_all:
@@ -781,6 +776,9 @@ static int do_dentry_open(struct file *f,
f->f_path.dentry = NULL;
f->f_inode = NULL;
return error;
+out_fput:
+ fput(f);
+ return error;
}
/**
@@ -878,20 +876,14 @@ struct file *dentry_open(const struct path *path, int flags,
BUG_ON(!path->mnt);
f = get_empty_filp();
- if (!IS_ERR(f)) {
- f->f_flags = flags;
- error = vfs_open(path, f, cred);
- if (!error) {
- /* from now on we need fput() to dispose of f */
- error = open_check_o_direct(f);
- if (error) {
- fput(f);
- f = ERR_PTR(error);
- }
- } else {
- put_filp(f);
- f = ERR_PTR(error);
- }
+ if (IS_ERR(f))
+ return f;
+
+ f->f_flags = flags;
+ error = vfs_open(path, f, cred);
+ if (error) {
+ put_filp(f);
+ return ERR_PTR(error);
}
return f;
}
--
2.14.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] fs: fold open_check_o_direct into do_dentry_open
2018-03-20 10:30 [PATCH] fs: fold open_check_o_direct into do_dentry_open Christoph Hellwig
@ 2018-04-25 15:03 ` J. R. Okajima
2018-04-26 7:19 ` Christoph Hellwig
0 siblings, 1 reply; 4+ messages in thread
From: J. R. Okajima @ 2018-04-25 15:03 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: viro, linux-fsdevel
Christoph Hellwig:
> do_dentry_open is where we do the actual open of the file, so this is
> where we should do our O_DIRECT sanity check to cover all potential
> callers.
:::
> diff --git a/fs/namei.c b/fs/namei.c
> index 920a828ab2ce..9d6d8e8aed55 100644
> --- a/fs/namei.c
> +++ b/fs/namei.c
> @@ -3374,9 +3374,7 @@ static int do_last(struct nameidata *nd,
> goto out;
> *opened |= FILE_OPENED;
> opened:
> - error = open_check_o_direct(file);
> - if (!error)
> - error = ima_file_check(file, op->acc_mode, *opened);
> + error = ima_file_check(file, op->acc_mode, *opened);
> if (!error && will_truncate)
> error = handle_truncate(file);
Removing the check from here may cause a problem I am afraid.
In open(O_ATOMIC|O_DIRECT) case, the check is totally gone, isn't it?
J. R. Okajima
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] fs: fold open_check_o_direct into do_dentry_open
2018-04-25 15:03 ` J. R. Okajima
@ 2018-04-26 7:19 ` Christoph Hellwig
2018-04-26 15:50 ` J. R. Okajima
0 siblings, 1 reply; 4+ messages in thread
From: Christoph Hellwig @ 2018-04-26 7:19 UTC (permalink / raw)
To: J. R. Okajima; +Cc: Christoph Hellwig, viro, linux-fsdevel
On Thu, Apr 26, 2018 at 12:03:34AM +0900, J. R. Okajima wrote:
> Christoph Hellwig:
> > do_dentry_open is where we do the actual open of the file, so this is
> > where we should do our O_DIRECT sanity check to cover all potential
> > callers.
> :::
> > diff --git a/fs/namei.c b/fs/namei.c
> > index 920a828ab2ce..9d6d8e8aed55 100644
> > --- a/fs/namei.c
> > +++ b/fs/namei.c
> > @@ -3374,9 +3374,7 @@ static int do_last(struct nameidata *nd,
> > goto out;
> > *opened |= FILE_OPENED;
> > opened:
> > - error = open_check_o_direct(file);
> > - if (!error)
> > - error = ima_file_check(file, op->acc_mode, *opened);
> > + error = ima_file_check(file, op->acc_mode, *opened);
> > if (!error && will_truncate)
> > error = handle_truncate(file);
>
> Removing the check from here may cause a problem I am afraid.
> In open(O_ATOMIC|O_DIRECT) case, the check is totally gone, isn't it?
You mean O_DIRECT using ->atomic_open?
Those are supposed to call finish_open(), which calls do_dentry_open
and thus the O_DIRECT check.
>
>
>
> J. R. Okajima
---end quoted text---
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2018-04-26 15:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-20 10:30 [PATCH] fs: fold open_check_o_direct into do_dentry_open Christoph Hellwig
2018-04-25 15:03 ` J. R. Okajima
2018-04-26 7:19 ` Christoph Hellwig
2018-04-26 15:50 ` J. R. Okajima
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).