Fix infinite loop in quota
Jan Kara
reviewerPATCH 1/1 Fix infinite loop in quota
Hi!
Attached patch fixes possible infinite loop in dqput() when quota code
fails to start a transaction on a filesystem. Andrew, please apply. Thanks.
Honza
PS: Thanks goes to Xavier for spotting and analyzing the problem.
Signature · 2 lines
Jan Kara <[email protected]> SuSE CR Labs
If we fail to start a transaction when releasing dquot, we have to call dquot_release() anyway to mark dquot structure as inactive. Otherwise we end in an infinite loop inside dqput().
Signed-off-by Jan Kara <[email protected]>
fs/ext3/super.c +10 -1
@@ -2578,8 +2578,11 @@ static int ext3_release_dquot(struct dqu handle =ext3_journal_start (dquot_to_inode (dquot),EXT3_QUOTA_DEL_BLOCKS (dquot->dq_sb)); -if (IS_ERR (handle)) +if (IS_ERR (handle)) { +/* Release dquot anyway to avoid endless cycle in dqput() */ +dquot_release (dquot);return PTR_ERR (handle); + } ret =dquot_release (dquot); err =ext3_journal_stop (handle);if (!ret)
@@ -2712,6 +2715,12 @@ static ssize_t ext3_quota_write(struct sstruct buffer_head *bh;handle_t *handle =journal_current_handle (); +if (!handle) { +printk (KERN_WARNING "EXT3-fs: Quota write (off=%Lu, len=%Lu)" +" cancelled because transaction is not started.\n" , + (unsigned long long )off, (unsigned long long )len); +return -EIO ; + }mutex_lock_nested (&inode->i_mutex,I_MUTEX_QUOTA );while (towrite >0 ) { tocopy = sb->s_blocksize - offset < towrite ?
fs/ext4/super.c +10 -1
@@ -2698,8 +2698,11 @@ static int ext4_release_dquot(struct dqu handle =ext4_journal_start (dquot_to_inode (dquot),EXT4_QUOTA_DEL_BLOCKS (dquot->dq_sb)); -if (IS_ERR (handle)) +if (IS_ERR (handle)) { +/* Release dquot anyway to avoid endless cycle in dqput() */ +dquot_release (dquot);return PTR_ERR (handle); + } ret =dquot_release (dquot); err =ext4_journal_stop (handle);if (!ret)
@@ -2832,6 +2835,12 @@ static ssize_t ext4_quota_write(struct sstruct buffer_head *bh;handle_t *handle =journal_current_handle (); +if (!handle) { +printk (KERN_WARNING "EXT4-fs: Quota write (off=%Lu, len=%Lu)" +" cancelled because transaction is not started.\n" , + (unsigned long long )off, (unsigned long long )len); +return -EIO ; + }mutex_lock_nested (&inode->i_mutex,I_MUTEX_QUOTA );while (towrite >0 ) { tocopy = sb->s_blocksize - offset < towrite ?
fs/reiserfs/super.c +11 -2
@@ -1915,8 +1915,11 @@ static int reiserfs_release_dquot(struct ret =journal_begin (&th, dquot->dq_sb,REISERFS_QUOTA_DEL_BLOCKS (dquot->dq_sb)); -if (ret) +if (ret) { +/* Release dquot anyway to avoid endless cycle in dqput() */ +dquot_release (dquot); goto out; + } ret =dquot_release (dquot); err = journal_end(&th, dquot->dq_sb,
@@ -2067,6 +2070,12 @@ static ssize_t reiserfs_quota_write(strusize_t towrite = len;struct buffer_head tmp_bh, *bh; +if (!current->journal_info) { +printk (KERN_WARNING "reiserfs: Quota write (off=%Lu, len=%Lu)" +" cancelled because transaction is not started.\n" , + (unsigned long long )off, (unsigned long long )len); +return -EIO ; + }mutex_lock_nested (&inode->i_mutex,I_MUTEX_QUOTA );while (towrite >0 ) { tocopy = sb->s_blocksize - offset < towrite ?
@@ -2098,7 +2107,7 @@ static ssize_t reiserfs_quota_write(stru data += tocopy; blk++; } - out: +out:if (len == towrite)return err;if (inode->i_size < off + len - towrite)