OSDN Git Service

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 09:49:30 +0000 (11:49 +0200)
commit8e510cd92199e863bd457f6b56ad85e00dfb3cb3
tree72e26cc11b0a252f8679253082d2ce19f3db3407
parent33f9cff6ec2fbfcf0b40d4328d292c745185fdf4
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