From cd4c76ff807c1afeed89f1b7e311760c0e296349 Mon Sep 17 00:00:00 2001

From: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

Date: Tue, 5 Oct 2021 19:08:08 +0300

Subject: [Backport cd4c76ff807c] src: Refactor ni_parse_reparse

Change argument from void* to struct REPARSE_DATA_BUFFER*

We copy data to buffer, so we can read it later in ntfs_read_mft.

Signed-off-by: Konstantin Komarov <almaz.alexandrovich@paragon-software.com>

---

 src/frecord.c | 9 +++++----

 src/ntfs_fs.h | 2 +-

 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/frecord.c b/src/frecord.c

index 007602badd9000ce190dd5a0ad13e0618aa27e83..ecb965e4afd075e2e38be7dfda7ad71f3ff1e150 100644

--- a/src/frecord.c

+++ b/src/frecord.c

@@ -1710,18 +1710,16 @@ int ni_new_attr_flags(struct ntfs_inode *ni, enum FILE_ATTRIBUTE new_fa)

 /*

  * ni_parse_reparse

  *

- * Buffer is at least 24 bytes.

+ * buffer - memory for reparse buffer header

  */

 enum REPARSE_SIGN ni_parse_reparse(struct ntfs_inode *ni, struct ATTRIB *attr,

-				   void *buffer)

+				   struct REPARSE_DATA_BUFFER *buffer)

 {

 	const struct REPARSE_DATA_BUFFER *rp = NULL;

 	u8 bits;

 	u16 len;

 	typeof(rp->CompressReparseBuffer) *cmpr;

-	static_assert(sizeof(struct REPARSE_DATA_BUFFER) <= 24);

-

 	/* Try to estimate reparse point. */

 	if (!attr->non_res) {

 		rp = resident_data_ex(attr, sizeof(struct REPARSE_DATA_BUFFER));

@@ -1807,6 +1805,9 @@ enum REPARSE_SIGN ni_parse_reparse(struct ntfs_inode *ni, struct ATTRIB *attr,

 		return REPARSE_NONE;

 	}

+	if (buffer != rp)

+		memcpy(buffer, rp, sizeof(struct REPARSE_DATA_BUFFER));

+

 	/* Looks like normal symlink. */

 	return REPARSE_LINK;

 }

diff --git a/src/ntfs_fs.h b/src/ntfs_fs.h

index 9277b552f2578ee8e94784afe9772614b02748a0..e95d93c683ed9852a1b941c3ac8585af0b925f7f 100644

--- a/src/ntfs_fs.h

+++ b/src/ntfs_fs.h

@@ -547,7 +547,7 @@ struct ATTR_FILE_NAME *ni_fname_type(struct ntfs_inode *ni, u8 name_type,

 				     struct ATTR_LIST_ENTRY **entry);

 int ni_new_attr_flags(struct ntfs_inode *ni, enum FILE_ATTRIBUTE new_fa);

 enum REPARSE_SIGN ni_parse_reparse(struct ntfs_inode *ni, struct ATTRIB *attr,

-				   void *buffer);

+				   struct REPARSE_DATA_BUFFER *buffer);

 int ni_write_inode(struct inode *inode, int sync, const char *hint);

 #define _ni_write_inode(i, w) ni_write_inode(i, w, __func__)

 int ni_fiemap(struct ntfs_inode *ni, struct fiemap_extent_info *fieinfo,

-- 

2.31.1