[PATCH 0/1] MR6530: ntdll: Ensure Unix path strings are wrapped with debugstr_a in traces.

[Owen Rudge (＠orudge)]

If a particularly long path is passed into these functions, it can cause a buffer overflow and cause unpredictable behaviour.

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/6530

[PATCH 1/1] ntdll: Ensure Unix path strings are wrapped with debugstr_a in traces.

[Owen Rudge]

From: Owen Rudge <orudge(a)codeweavers.com>

---
 dlls/ntdll/unix/file.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c
index ca95dd347eb..d6cd699dde3 100644
--- a/dlls/ntdll/unix/file.c
+++ b/dlls/ntdll/unix/file.c
@@ -1781,7 +1781,7 @@ static int get_file_info( const char *path, struct stat *st, ULONG *attr )
         if (errno == ENOATTR) return ret;
 #endif
         WARN( "Failed to get extended attribute " SAMBA_XATTR_DOS_ATTRIB " from \"%s\". errno %d (%s)\n",
-              path, errno, strerror( errno ) );
+              debugstr_a(path), errno, strerror( errno ) );
     }
     return ret;
 }
@@ -2317,12 +2317,12 @@ static NTSTATUS get_dir_data_entry( struct dir_data *dir_data, void *info_ptr, I
 
     if (get_file_info( names->unix_name, &st, &attributes ) == -1)
     {
-        TRACE( "file no longer exists %s\n", names->unix_name );
+        TRACE( "file no longer exists %s\n", debugstr_a(names->unix_name) );
         return STATUS_SUCCESS;
     }
     if (is_ignored_file( &st ))
     {
-        TRACE( "ignoring file %s\n", names->unix_name );
+        TRACE( "ignoring file %s\n", debugstr_a(names->unix_name) );
         return STATUS_SUCCESS;
     }
     start = dir_info_align( io->Information );
@@ -2486,7 +2486,7 @@ static NTSTATUS read_directory_data_getattrlist( struct dir_data *data, const ch
             return STATUS_NO_SUCH_FILE;
     }
 
-    TRACE( "found %s\n", buffer.name );
+    TRACE( "found %s\n", debugstr_a(buffer.name) );
 
     if (!append_entry( data, buffer.name, NULL, NULL )) return STATUS_NO_MEMORY;
 
@@ -2509,7 +2509,7 @@ static NTSTATUS read_directory_data_stat( struct dir_data *data, const char *uni
     if (!get_dir_case_sensitivity(".")) return STATUS_NO_SUCH_FILE;
     if (stat( unix_name, &st ) == -1) return STATUS_NO_SUCH_FILE;
 
-    TRACE( "found %s\n", unix_name );
+    TRACE( "found %s\n", debugstr_a(unix_name) );
 
     if (!append_entry( data, unix_name, NULL, NULL )) return STATUS_NO_MEMORY;
 
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/6530