Skip to content

Commit

Permalink
vfs: fix deadlock in file_remove_privs() on overlayfs
Browse files Browse the repository at this point in the history
commit c1892c3 upstream.

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: 07a2daa ("ovl: Copy up underlying inode's ->i_mode to overlay inode")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Miklos Szeredi authored and Greg Kroah-Hartman committed Aug 10, 2016
1 parent 33f9cff commit 8e510cd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions fs/inode.c
Original file line number Diff line number Diff line change
Expand Up @@ -1733,16 +1733,16 @@ 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;

/* Fast path for nothing security related */
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)
Expand Down

0 comments on commit 8e510cd

Please sign in to comment.