From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 19 Oct 2023 16:10:18 +0000 (-0700)
Subject: Merge tag 'ntfs3_for_6.6' of https://github.com/Paragon-Software-Group/linux-ntfs3
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f69d00d12fcee9ce4b4f24bf609ad7398d10a576;p=linux.git

Merge tag 'ntfs3_for_6.6' of https://github.com/Paragon-Software-Group/linux-ntfs3

Pull ntfs3 fixes from Konstantin Komarov:

 - memory leak

 - some logic errors, NULL dereferences

 - some code was refactored

 - more sanity checks

* tag 'ntfs3_for_6.6' of https://github.com/Paragon-Software-Group/linux-ntfs3:
  fs/ntfs3: Avoid possible memory leak
  fs/ntfs3: Fix directory element type detection
  fs/ntfs3: Fix possible null-pointer dereference in hdr_find_e()
  fs/ntfs3: Fix OOB read in ntfs_init_from_boot
  fs/ntfs3: fix panic about slab-out-of-bounds caused by ntfs_list_ea()
  fs/ntfs3: Fix NULL pointer dereference on error in attr_allocate_frame()
  fs/ntfs3: Fix possible NULL-ptr-deref in ni_readpage_cmpr()
  fs/ntfs3: Do not allow to change label if volume is read-only
  fs/ntfs3: Add more info into /proc/fs/ntfs3/<dev>/volinfo
  fs/ntfs3: Refactoring and comments
  fs/ntfs3: Fix alternative boot searching
  fs/ntfs3: Allow repeated call to ntfs3_put_sbi
  fs/ntfs3: Use inode_set_ctime_to_ts instead of inode_set_ctime
  fs/ntfs3: Fix shift-out-of-bounds in ntfs_fill_super
  fs/ntfs3: fix deadlock in mark_as_free_ex
  fs/ntfs3: Add more attributes checks in mi_enum_attr()
  fs/ntfs3: Use kvmalloc instead of kmalloc(... __GFP_NOWARN)
  fs/ntfs3: Write immediately updated ntfs state
  fs/ntfs3: Add ckeck in ni_update_parent()
---

f69d00d12fcee9ce4b4f24bf609ad7398d10a576
diff --cc fs/ntfs3/super.c
index 5661a363005ee,5341ed80e2d2a..f763e3256ccc1
--- a/fs/ntfs3/super.c
+++ b/fs/ntfs3/super.c
@@@ -1562,8 -1607,8 +1607,9 @@@ load_root
  put_inode_out:
  	iput(inode);
  out:
 +	ntfs3_put_sbi(sbi);
  	kfree(boot2);
+ 	ntfs3_put_sbi(sbi);
  	return err;
  }