lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
Open Source and information security mailing list archives
| ||
|
Message-Id: <1364801462-13120-1-git-send-email-dmonakhov@openvz.org> Date: Mon, 1 Apr 2013 11:31:02 +0400 From: Dmitry Monakhov <dmonakhov@...nvz.org> To: linux-ext4@...r.kernel.org Cc: Dmitry Monakhov <dmonakhov@...nvz.org> Subject: [PATCH] ext4: fix incorrect lock ordering for ext4_ext_migrate existing locking ordering: journal-> i_data_sem, but ext4_ext_migrate() grab locks in opposite order which may result in deacklock. Signed-off-by: Dmitry Monakhov <dmonakhov@...nvz.org> --- fs/ext4/extents.c | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fs/ext4/extents.c b/fs/ext4/extents.c index e4a6844..1530cf4 100644 --- a/fs/ext4/extents.c +++ b/fs/ext4/extents.c @@ -4627,6 +4627,10 @@ int ext4_ind_migrate(struct inode *inode) (!ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS))) return -EINVAL; + handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1); + if (IS_ERR(handle)) + return PTR_ERR(handle); + down_write(&EXT4_I(inode)->i_data_sem); ret = ext4_ext_check_inode(inode); if (ret) @@ -4650,19 +4654,13 @@ int ext4_ind_migrate(struct inode *inode) } } - handle = ext4_journal_start(inode, EXT4_HT_MIGRATE, 1); - if (IS_ERR(handle)) { - ret = PTR_ERR(handle); - goto errout; - } - ext4_clear_inode_flag(inode, EXT4_INODE_EXTENTS); memset(ei->i_data, 0, sizeof(ei->i_data)); for (i=0; i < len; i++) ei->i_data[i] = cpu_to_le32(blk++); ext4_mark_inode_dirty(handle, inode); - ext4_journal_stop(handle); errout: + ext4_journal_stop(handle); up_write(&EXT4_I(inode)->i_data_sem); return ret; } -- 1.7.1 -- To unsubscribe from this list: send the line "unsubscribe linux-ext4" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Powered by blists - more mailing lists