From: David Howells <dhowells@redhat.com>
To: sds@tycho.nsa.gov, viro@zeniv.linux.org.uk, miklos@szeredi.hu
Cc: linux-fsdevel@vger.kernel.org, dhowells@redhat.com,
linux-security-module@vger.kernel.org,
linux-unionfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/8] overlay: Call ovl_drop_write() earlier in ovl_dentry_open()
Date: Thu, 18 Jun 2015 14:32:23 +0100 [thread overview]
Message-ID: <20150618133223.12722.1869.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20150618133215.12722.70352.stgit@warthog.procyon.org.uk>
Call ovl_drop_write() earlier in ovl_dentry_open() before we call vfs_open()
as we've done the copy up for which we needed the freeze-write lock by that
point.
Signed-off-by: David Howells <dhowells@redhat.com>
---
fs/overlayfs/inode.c | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
diff --git a/fs/overlayfs/inode.c b/fs/overlayfs/inode.c
index 308379b2d0b2..21079d1ca2aa 100644
--- a/fs/overlayfs/inode.c
+++ b/fs/overlayfs/inode.c
@@ -343,31 +343,25 @@ static int ovl_dentry_open(struct dentry *dentry, struct file *file,
int err;
struct path realpath;
enum ovl_path_type type;
- bool want_write = false;
type = ovl_path_real(dentry, &realpath);
if (ovl_open_need_copy_up(file->f_flags, type, realpath.dentry)) {
- want_write = true;
err = ovl_want_write(dentry);
if (err)
- goto out;
+ return err;
if (file->f_flags & O_TRUNC)
err = ovl_copy_up_last(dentry, NULL, true);
else
err = ovl_copy_up(dentry);
+ ovl_drop_write(dentry);
if (err)
- goto out_drop_write;
+ return err;
ovl_path_upper(dentry, &realpath);
}
- err = vfs_open(&realpath, file, cred);
-out_drop_write:
- if (want_write)
- ovl_drop_write(dentry);
-out:
- return err;
+ return vfs_open(&realpath, file, cred);
}
static const struct inode_operations ovl_file_inode_operations = {
next prev parent reply other threads:[~2015-06-18 13:32 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-18 13:32 [PATCH 0/8] Security: Provide unioned file support David Howells
2015-06-18 13:32 ` David Howells [this message]
2015-06-18 13:32 ` [PATCH 2/8] overlayfs: Make f_path always point to the overlay and f_inode to the underlay David Howells
2015-07-20 12:42 ` Konstantin Khlebnikov
2015-07-21 13:28 ` Konstantin Khlebnikov
2015-06-18 13:32 ` [PATCH 3/8] Security: Provide copy-up security hooks for unioned files David Howells
2015-06-18 13:32 ` [PATCH 4/8] Overlayfs: Use copy-up security hooks David Howells
2015-06-18 13:32 ` [PATCH 5/8] SELinux: Stub in copy-up handling David Howells
2015-06-18 14:44 ` Stephen Smalley
2015-06-18 14:44 ` Stephen Smalley
2015-06-18 15:34 ` Casey Schaufler
2015-06-18 16:51 ` David Howells
2015-06-18 16:51 ` David Howells
2015-06-18 13:33 ` [PATCH 6/8] SELinux: Handle opening of a unioned file David Howells
2015-06-18 14:54 ` Stephen Smalley
2015-06-18 14:54 ` Stephen Smalley
2015-06-18 15:04 ` David Howells
2015-06-18 15:04 ` David Howells
2015-06-18 13:33 ` [PATCH 7/8] SELinux: Create a common helper to determine an inode label David Howells
2015-06-18 14:56 ` Stephen Smalley
2015-06-18 14:56 ` Stephen Smalley
2015-06-18 15:13 ` David Howells
2015-06-18 15:13 ` David Howells
2015-06-18 15:20 ` Stephen Smalley
2015-06-18 15:20 ` Stephen Smalley
2015-06-18 15:32 ` David Howells
2015-06-18 15:32 ` David Howells
2015-06-18 15:47 ` Stephen Smalley
2015-06-18 15:47 ` Stephen Smalley
2015-06-18 15:47 ` Stephen Smalley
2015-06-18 15:47 ` Stephen Smalley
2015-06-18 13:33 ` [PATCH 8/8] SELinux: Check against union label for file operations David Howells
2015-06-19 7:20 ` [PATCH 0/8] Security: Provide unioned file support Al Viro
2015-06-19 7:52 ` Miklos Szeredi
2015-06-19 7:59 ` Al Viro
2015-06-19 8:11 ` Miklos Szeredi
2015-06-19 8:29 ` Al Viro
2015-06-19 8:36 ` Miklos Szeredi
2015-06-19 14:04 ` David Howells
2015-06-19 14:04 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20150618133223.12722.1869.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-fsdevel@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-security-module@vger.kernel.org \
--cc=linux-unionfs@vger.kernel.org \
--cc=miklos@szeredi.hu \
--cc=sds@tycho.nsa.gov \
--cc=viro@zeniv.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.