diff options
| author | Miklos Szeredi <mszeredi@redhat.com> | 2016-08-03 13:44:27 +0200 |
|---|---|---|
| committer | Miklos Szeredi <mszeredi@redhat.com> | 2016-08-03 13:57:56 +0200 |
| commit | c1892c37769cf89c7e7ba57528ae2ccb5d153c9b (patch) | |
| tree | 47ce773ce58dd4f584ba8baffce973b9d55a1148 | |
| parent | 523d939ef98fd712632d93a5a2b588e477a7565e (diff) | |
| download | blackbird-op-linux-c1892c37769cf89c7e7ba57528ae2ccb5d153c9b.tar.gz blackbird-op-linux-c1892c37769cf89c7e7ba57528ae2ccb5d153c9b.zip | |
vfs: fix deadlock in file_remove_privs() on overlayfs
file_remove_privs() is called with inode lock on file_inode(), which
proceeds to calling notify_change() on file->f_path.dentry. Which triggers
the WARN_ON_ONCE(!inode_is_locked(inode)) in addition to deadlocking later
when ovl_setattr tries to lock the underlying inode again.
Fix this mess by not mixing the layers, but doing everything on underlying
dentry/inode.
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Fixes: 07a2daab49c5 ("ovl: Copy up underlying inode's ->i_mode to overlay inode")
Cc: <stable@vger.kernel.org>
| -rw-r--r-- | fs/inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/inode.c b/fs/inode.c index 4ccbc21b30ce..68db39050446 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -1740,8 +1740,8 @@ static int __remove_privs(struct dentry *dentry, int kill) */ int file_remove_privs(struct file *file) { - struct dentry *dentry = file->f_path.dentry; - struct inode *inode = d_inode(dentry); + struct dentry *dentry = file_dentry(file); + struct inode *inode = file_inode(file); int kill; int error = 0; @@ -1749,7 +1749,7 @@ int file_remove_privs(struct file *file) if (IS_NOSEC(inode)) return 0; - kill = file_needs_remove_privs(file); + kill = dentry_needs_remove_privs(dentry); if (kill < 0) return kill; if (kill) |
