]> 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>
Tue, 16 Aug 2016 07:34:57 +0000 (09:34 +0200)
commit99ffed7450336acce9045a2eb6a4ff66c6d19457
tree41b8becbdecd7609321ab85c0ca2d9164bd3f3da
parent37fe52815ecb74f6aa1efd398ba0704f83c70550
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