]> git.ipfire.org Git - thirdparty/kernel/stable.git/commit
vfs: fix deadlock in file_remove_privs() on overlayfs
authorMiklos Szeredi <mszeredi@redhat.com>
Wed, 3 Aug 2016 11:44:27 +0000 (13:44 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Aug 2016 10:54:50 +0000 (12:54 +0200)
commit42c7aa83c3a6ab314d271ba89b67f96eafd72bd2
treec3cdde600d3fda8bf5787dc24457313e8af14345
parent04678f5598322beecf6f06ddf73b2eb6a8b0ef9a
vfs: fix deadlock in file_remove_privs() on overlayfs

commit c1892c37769cf89c7e7ba57528ae2ccb5d153c9b 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: 07a2daab49c5 ("ovl: Copy up underlying inode's ->i_mode to overlay inode")
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
fs/inode.c