Unverified Commit 451e45a0 authored by Konstantin Komarov's avatar Konstantin Komarov
Browse files

fs/ntfs3: Make ni_ins_new_attr return error 



Function ni_ins_new_attr now returns ERR_PTR(err),
so we check it now in other functions like ni_expand_mft_list

Signed-off-by: default avatarKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
parent 8039edba

fs/ntfs3/frecord.c

+26 −3
Original line number Diff line number Diff line
@@ -469,7 +469,7 @@ ni_ins_new_attr(struct ntfs_inode *ni, struct mft_inode *mi, 
				&ref, &le);

		if (err) {

			/* No memory or no space. */

			return NULL;

			return ERR_PTR(err);

		}

		le_added = true;
@@ -1011,6 +1011,8 @@ static int ni_ins_attr_ext(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le, 
				       name_off, svcn, ins_le);

		if (!attr)

			continue;

		if (IS_ERR(attr))

			return PTR_ERR(attr);



		if (ins_attr)

			*ins_attr = attr;
@@ -1032,8 +1034,15 @@ static int ni_ins_attr_ext(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le, 


	attr = ni_ins_new_attr(ni, mi, le, type, name, name_len, asize,

			       name_off, svcn, ins_le);

	if (!attr)

	if (!attr) {

		err = -EINVAL;

		goto out2;

	}



	if (IS_ERR(attr)) {

		err = PTR_ERR(attr);

		goto out2;

	}



	if (ins_attr)

		*ins_attr = attr;
@@ -1045,7 +1054,6 @@ static int ni_ins_attr_ext(struct ntfs_inode *ni, struct ATTR_LIST_ENTRY *le, 
out2:

	ni_remove_mi(ni, mi);

	mi_put(mi);

	err = -EINVAL;



out1:

	ntfs_mark_rec_free(sbi, rno, is_mft);
@@ -1101,6 +1109,11 @@ static int ni_insert_attr(struct ntfs_inode *ni, enum ATTR_TYPE type, 
	if (asize <= free) {

		attr = ni_ins_new_attr(ni, &ni->mi, NULL, type, name, name_len,

				       asize, name_off, svcn, ins_le);

		if (IS_ERR(attr)) {

			err = PTR_ERR(attr);

			goto out;

		}



		if (attr) {

			if (ins_attr)

				*ins_attr = attr;
@@ -1198,6 +1211,11 @@ static int ni_insert_attr(struct ntfs_inode *ni, enum ATTR_TYPE type, 
		goto out;

	}



	if (IS_ERR(attr)) {

		err = PTR_ERR(attr);

		goto out;

	}



	if (ins_attr)

		*ins_attr = attr;

	if (ins_mi)
@@ -1313,6 +1331,11 @@ static int ni_expand_mft_list(struct ntfs_inode *ni) 
		goto out;

	}



	if (IS_ERR(attr)) {

		err = PTR_ERR(attr);

		goto out;

	}



	attr->non_res = 1;

	attr->name_off = SIZEOF_NONRESIDENT_LE;

	attr->flags = 0;