aboutsummaryrefslogtreecommitdiffstats
path: root/fs/f2fs/dir.c
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk.kim@samsung.com>2013-10-28 13:17:54 +0900
committerAndreas Blaesius <skate4life@gmx.de>2016-06-05 21:20:47 +0200
commita8380718ba772c6f174fe838897787f9070bc482 (patch)
tree02531545cb287c8fdfd980b99751adfaa7d729ba /fs/f2fs/dir.c
parent7adb1d4b6af65e557ee73544cb2f06afb32b0374 (diff)
downloadkernel_samsung_espresso10-a8380718ba772c6f174fe838897787f9070bc482.zip
kernel_samsung_espresso10-a8380718ba772c6f174fe838897787f9070bc482.tar.gz
kernel_samsung_espresso10-a8380718ba772c6f174fe838897787f9070bc482.tar.bz2
f2fs: fix a deadlock during init_acl procedure
The deadlock is found through the following scenario. sys_mkdir() -> f2fs_add_link() -> __f2fs_add_link() -> init_inode_metadata() : lock_page(inode); -> f2fs_init_acl() -> f2fs_set_acl() -> f2fs_setxattr(..., NULL) : This NULL page incurs a deadlock at update_inode_page(). So, likewise f2fs_init_security(), this patch adds a parameter to transfer the locked inode page to f2fs_setxattr(). Found by Linux File System Verification project (linuxtesting.org). Reported-by: Alexey Khoroshilov <khoroshilov@ispras.ru> Signed-off-by: Jaegeuk Kim <jaegeuk.kim@samsung.com> Conflicts: fs/f2fs/acl.c fs/f2fs/acl.h Change-Id: I38d7b19fa3eb862941576a34cc6c1c18ce2d62dd
Diffstat (limited to 'fs/f2fs/dir.c')
-rw-r--r--fs/f2fs/dir.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 972d694..ae25292 100644
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -346,7 +346,7 @@ static struct page *init_inode_metadata(struct inode *inode,
goto error;
}
- err = f2fs_init_acl(inode, dir);
+ err = f2fs_init_acl(inode, dir, page);
if (err)
goto error;