[syslinux:master] ntfs: fix incorrect file-> offset usage in ntfs_readdir

[syslinux-bot for Andy Alex]

Commit-ID:  65303105b13fd294fc51d1a9a59f2d1d038f5cca
Gitweb:     http://www.syslinux.org/commit/65303105b13fd294fc51d1a9a59f2d1d038f5cca
Author:     Andy Alex <andy at r-tt.com>
AuthorDate: Mon, 2 Jun 2014 20:28:22 +0300
Committer:  H. Peter Anvin <hpa at linux.intel.com>
CommitDate: Mon, 2 Jun 2014 13:39:52 -0700

ntfs: fix incorrect file->offset usage in ntfs_readdir

file->offset is used to store position in index root between
ntfs_readdir calls.  Previously, pointer to buffer was stored in this
field. However this buffer is reallocated and read each ntfs_readdir
call so the pointer may become incorrect.  Now offset in index root
rather than pointer is stored in this field.

[ hpa: applied patch manually as it arrived whitespace-corrupted ]

Signed-off-by: Andy Alex <andy at r-tt.com>
Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>

---
 core/fs/ntfs/ntfs.c | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/core/fs/ntfs/ntfs.c b/core/fs/ntfs/ntfs.c
index 257c95b..4c0a09c 100644
--- a/core/fs/ntfs/ntfs.c
+++ b/core/fs/ntfs/ntfs.c
@@ -1057,14 +1057,12 @@ static int ntfs_readdir(struct file *file, struct dirent *dirent)
     ir = (struct ntfs_idx_root *)((uint8_t *)attr +
                             attr->data.resident.value_offset);
 
-    if (!file->offset && readdir_state->in_idx_root) {
-        file->offset = (uint32_t)((uint8_t *)&ir->index +
-                                        ir->index.entries_offset);
-    }
+    if (!file->offset && readdir_state->in_idx_root)
+        file->offset = ir->index.entries_offset;
 
 idx_root_next_entry:
     if (readdir_state->in_idx_root) {
-        ie = (struct ntfs_idx_entry *)(uint8_t *)file->offset;
+        ie = (struct ntfs_idx_entry *)((uint8_t *)&ir->index + file->offset);
         if (ie->flags & INDEX_ENTRY_END) {
             file->offset = 0;
             readdir_state->in_idx_root = false;
@@ -1074,7 +1072,7 @@ idx_root_next_entry:
             goto descend_into_child_node;
         }
 
-        file->offset = (uint32_t)((uint8_t *)ie + ie->len);
+        file->offset += ie->len;
         len = ntfs_cvt_filename(filename, ie);
         if (!is_filename_printable(filename))
             goto idx_root_next_entry;