]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
fs/ntfs3: Correct undo if ntfs_create_inode failed
authorKonstantin Komarov <almaz.alexandrovich@paragon-software.com>
Thu, 30 May 2024 07:59:13 +0000 (10:59 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 3 Aug 2024 07:00:22 +0000 (09:00 +0200)
[ Upstream commit f28d0866d8ff798aa497971f93d0cc58f442d946 ]

Clusters allocated for Extended Attributes, must be freed
when rolling back inode creation.

Fixes: 82cae269cfa95 ("fs/ntfs3: Add initialization of super block")
Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
fs/ntfs3/inode.c

index bef3b4a36b75051ee68c3a586c8b1da56cb2d63c..9559d72f8660600eae77ba65847f1b66452b4c3e 100644 (file)
@@ -1668,7 +1668,9 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
         * The packed size of extended attribute is stored in direntry too.
         * 'fname' here points to inside new_de.
         */
-       ntfs_save_wsl_perm(inode, &fname->dup.ea_size);
+       err = ntfs_save_wsl_perm(inode, &fname->dup.ea_size);
+       if (err)
+               goto out6;
 
        /*
         * update ea_size in file_name attribute too.
@@ -1712,6 +1714,12 @@ int ntfs_create_inode(struct mnt_idmap *idmap, struct inode *dir,
        goto out2;
 
 out6:
+       attr = ni_find_attr(ni, NULL, NULL, ATTR_EA, NULL, 0, NULL, NULL);
+       if (attr && attr->non_res) {
+               /* Delete ATTR_EA, if non-resident. */
+               attr_set_size(ni, ATTR_EA, NULL, 0, NULL, 0, NULL, false, NULL);
+       }
+
        if (rp_inserted)
                ntfs_remove_reparse(sbi, IO_REPARSE_TAG_SYMLINK, &new_de->ref);