Unverified Commit a1b04d38 authored by Dan Carpenter's avatar Dan Carpenter Committed by Konstantin Komarov
Browse files

fs/ntfs3: add checks for allocation failure 



Add a check for when the kzalloc() in init_rsttbl() fails.  Some of
the callers checked for NULL and some did not.  I went down the call
tree and added NULL checks where ever they were missing.

Fixes: b46acd6a ("fs/ntfs3: Add NTFS journal")
Signed-off-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarKari Argillander <kari.argillander@gmail.com>
Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 345482bc

fs/ntfs3/fslog.c

+16 −2
Original line number Diff line number Diff line
@@ -809,6 +809,9 @@ static inline struct RESTART_TABLE *init_rsttbl(u16 esize, u16 used) 
	u32 lf = sizeof(struct RESTART_TABLE) + (used - 1) * esize;

	struct RESTART_TABLE *t = kzalloc(bytes, GFP_NOFS);



	if (!t)

		return NULL;



	t->size = cpu_to_le16(esize);

	t->used = cpu_to_le16(used);

	t->free_goal = cpu_to_le32(~0u);
@@ -831,7 +834,11 @@ static inline struct RESTART_TABLE *extend_rsttbl(struct RESTART_TABLE *tbl, 
	u16 esize = le16_to_cpu(tbl->size);

	__le32 osize = cpu_to_le32(bytes_per_rt(tbl));

	u32 used = le16_to_cpu(tbl->used);

	struct RESTART_TABLE *rt = init_rsttbl(esize, used + add);

	struct RESTART_TABLE *rt;



	rt = init_rsttbl(esize, used + add);

	if (!rt)

		return NULL;



	memcpy(rt + 1, tbl + 1, esize * used);
@@ -864,8 +871,11 @@ static inline void *alloc_rsttbl_idx(struct RESTART_TABLE **tbl) 
	__le32 *e;

	struct RESTART_TABLE *t = *tbl;



	if (!t->first_free)

	if (!t->first_free) {

		*tbl = t = extend_rsttbl(t, 16, ~0u);

		if (!t)

			return NULL;

	}



	off = le32_to_cpu(t->first_free);
@@ -4482,6 +4492,10 @@ int log_replay(struct ntfs_inode *ni, bool *initialized) 
		}



		dp = alloc_rsttbl_idx(&dptbl);

		if (!dp) {

			err = -ENOMEM;

			goto out;

		}

		dp->target_attr = cpu_to_le32(t16);

		dp->transfer_len = cpu_to_le32(t32 << sbi->cluster_bits);

		dp->lcns_follow = cpu_to_le32(t32);