Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03ab6855 authored by Yuezhang Mo's avatar Yuezhang Mo Committed by Namjae Jeon
Browse files

exfat: fix the newly allocated clusters are not freed in error handling 



In error handling 'free_cluster', before num_alloc clusters allocated,
p_chain->size will not updated and always 0, thus the newly allocated
clusters are not freed.

Signed-off-by: default avatarYuezhang Mo <Yuezhang.Mo@sony.com>
Reviewed-by: default avatarAndy Wu <Andy.Wu@sony.com>
Signed-off-by: default avatarNamjae Jeon <linkinjeon@kernel.org>
parent 7a55bf46

fatent.c

+8 −10
Original line number Diff line number Diff line
@@ -322,7 +322,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
		struct exfat_chain *p_chain, bool sync_bmap)

{

	int ret = -ENOSPC;

	unsigned int num_clusters = 0, total_cnt;

	unsigned int total_cnt;

	unsigned int hint_clu, new_clu, last_clu = EXFAT_EOF_CLUSTER;

	struct super_block *sb = inode->i_sb;

	struct exfat_sb_info *sbi = EXFAT_SB(sb);
@@ -373,7 +373,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
		if (new_clu != hint_clu &&

		    p_chain->flags == ALLOC_NO_FAT_CHAIN) {

			if (exfat_chain_cont_cluster(sb, p_chain->dir,

					num_clusters)) {

					p_chain->size)) {

				ret = -EIO;

				goto free_cluster;

			}
@@ -386,8 +386,6 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
			goto free_cluster;

		}



		num_clusters++;



		/* update FAT table */

		if (p_chain->flags == ALLOC_FAT_CHAIN) {

			if (exfat_ent_set(sb, new_clu, EXFAT_EOF_CLUSTER)) {
@@ -404,13 +402,14 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
				goto free_cluster;

			}

		}

		p_chain->size++;



		last_clu = new_clu;



		if (--num_alloc == 0) {

		if (p_chain->size == num_alloc) {

			sbi->clu_srch_ptr = hint_clu;

			sbi->used_clusters += num_clusters;

			sbi->used_clusters += num_alloc;



			p_chain->size += num_clusters;

			mutex_unlock(&sbi->bitmap_lock);

			return 0;

		}
@@ -421,7 +420,7 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 


			if (p_chain->flags == ALLOC_NO_FAT_CHAIN) {

				if (exfat_chain_cont_cluster(sb, p_chain->dir,

						num_clusters)) {

						p_chain->size)) {

					ret = -EIO;

					goto free_cluster;

				}
@@ -430,7 +429,6 @@ int exfat_alloc_cluster(struct inode *inode, unsigned int num_alloc, 
		}

	}

free_cluster:

	if (num_clusters)

	__exfat_free_cluster(inode, p_chain);

unlock:

	mutex_unlock(&sbi->bitmap_lock);