Fix ssh->fs reference in Nucleus/Harmony SFTP_GetAttributes helpers

yosuke-wolfssl · ejohnstown · commit 09cbe92daac7 · 2026-07-06T18:36:41.000-05:00
diff --git a/src/wolfsftp.c b/src/wolfsftp.c
@@ -4960,13 +4960,14 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,
     int ret;
 
     WOLFSSH_UNUSED(heap);
+    /* WSTAT/WLSTAT discard the fs handle on Nucleus, so fs stays unused. */
     WOLFSSH_UNUSED(fs);
 
     if (noFollow) {
-        ret = WLSTAT(ssh->fs, fileName, &stats);
+        ret = WLSTAT(fs, fileName, &stats);
     }
     else {
-        ret = WSTAT(ssh->fs, fileName, &stats);
+        ret = WSTAT(fs, fileName, &stats);
     }
 
     WMEMSET(atr, 0, sizeof(WS_SFTP_FILEATRB));
@@ -5530,12 +5531,16 @@ static int SFTP_GetAttributesStat(WS_SFTP_FILEATRB* atr, WSTAT_T* stats)
 }
 
 
-static int SFTP_GetAttributesHelper(WS_SFTP_FILEATRB* atr, const char* fName)
+static int SFTP_GetAttributesHelper(void* fs, WS_SFTP_FILEATRB* atr,
+        const char* fName)
 {
     WSTAT_T stats;
     SYS_FS_RESULT res;
     char buffer[255];
 
+    /* WSTAT discards the fs handle on Harmony, so fs stays unused. */
+    WOLFSSH_UNUSED(fs);
+
     WMEMSET(atr, 0, sizeof(WS_SFTP_FILEATRB));
     WMEMSET(buffer, 0, sizeof(buffer));
     res = SYS_FS_CurrentDriveGet(buffer);
@@ -5554,7 +5559,7 @@ static int SFTP_GetAttributesHelper(WS_SFTP_FILEATRB* atr, const char* fName)
         }
     }
 
-    if (WSTAT(ssh->fs, fName, &stats) != 0) {
+    if (WSTAT(fs, fName, &stats) != 0) {
         WLOG(WS_LOG_SFTP, "Issue with WSTAT call");
         return WS_BAD_FILE_E;
     }
@@ -5571,9 +5576,8 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,
         WS_SFTP_FILEATRB* atr, byte noFollow, void* heap)
 {
     WOLFSSH_UNUSED(heap);
-    WOLFSSH_UNUSED(fs);
 
-    return SFTP_GetAttributesHelper(atr, fileName);
+    return SFTP_GetAttributesHelper(fs, atr, fileName);
 }
 
 
@@ -5587,9 +5591,8 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,
 static int SFTP_GetAttributes_Handle(WOLFSSH* ssh, WFD fd,
         char* name, WS_SFTP_FILEATRB* atr)
 {
-    WOLFSSH_UNUSED(ssh);
     WOLFSSH_UNUSED(fd);
-    return SFTP_GetAttributesHelper(atr, name);
+    return SFTP_GetAttributesHelper(ssh->fs, atr, name);
 }
 #endif /* !NO_WOLFSSH_SERVER */
 

Original file line number	Diff line number	Diff line change
`@@ -4960,13 +4960,14 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,`
`4960`	`4960`	`int ret;`
`4961`	`4961`
`4962`	`4962`	`WOLFSSH_UNUSED(heap);`
	`4963`	`+ /* WSTAT/WLSTAT discard the fs handle on Nucleus, so fs stays unused. */`
`4963`	`4964`	`WOLFSSH_UNUSED(fs);`
`4964`	`4965`
`4965`	`4966`	`if (noFollow) {`
`4966`		`- ret = WLSTAT(ssh->fs, fileName, &stats);`
	`4967`	`+ ret = WLSTAT(fs, fileName, &stats);`
`4967`	`4968`	`}`
`4968`	`4969`	`else {`
`4969`		`- ret = WSTAT(ssh->fs, fileName, &stats);`
	`4970`	`+ ret = WSTAT(fs, fileName, &stats);`
`4970`	`4971`	`}`
`4971`	`4972`
`4972`	`4973`	`WMEMSET(atr, 0, sizeof(WS_SFTP_FILEATRB));`
`@@ -5530,12 +5531,16 @@ static int SFTP_GetAttributesStat(WS_SFTP_FILEATRB* atr, WSTAT_T* stats)`
`5530`	`5531`	`}`
`5531`	`5532`
`5532`	`5533`
`5533`		`-static int SFTP_GetAttributesHelper(WS_SFTP_FILEATRB* atr, const char* fName)`
	`5534`	`+static int SFTP_GetAttributesHelper(void* fs, WS_SFTP_FILEATRB* atr,`
	`5535`	`+ const char* fName)`
`5534`	`5536`	`{`
`5535`	`5537`	`WSTAT_T stats;`
`5536`	`5538`	`SYS_FS_RESULT res;`
`5537`	`5539`	`char buffer[255];`
`5538`	`5540`
	`5541`	`+ /* WSTAT discards the fs handle on Harmony, so fs stays unused. */`
	`5542`	`+ WOLFSSH_UNUSED(fs);`
	`5543`	`+`
`5539`	`5544`	`WMEMSET(atr, 0, sizeof(WS_SFTP_FILEATRB));`
`5540`	`5545`	`WMEMSET(buffer, 0, sizeof(buffer));`
`5541`	`5546`	`res = SYS_FS_CurrentDriveGet(buffer);`
`@@ -5554,7 +5559,7 @@ static int SFTP_GetAttributesHelper(WS_SFTP_FILEATRB* atr, const char* fName)`
`5554`	`5559`	`}`
`5555`	`5560`	`}`
`5556`	`5561`
`5557`		`- if (WSTAT(ssh->fs, fName, &stats) != 0) {`
	`5562`	`+ if (WSTAT(fs, fName, &stats) != 0) {`
`5558`	`5563`	`WLOG(WS_LOG_SFTP, "Issue with WSTAT call");`
`5559`	`5564`	`return WS_BAD_FILE_E;`
`5560`	`5565`	`}`
`@@ -5571,9 +5576,8 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,`
`5571`	`5576`	`WS_SFTP_FILEATRB* atr, byte noFollow, void* heap)`
`5572`	`5577`	`{`
`5573`	`5578`	`WOLFSSH_UNUSED(heap);`
`5574`		`- WOLFSSH_UNUSED(fs);`
`5575`	`5579`
`5576`		`- return SFTP_GetAttributesHelper(atr, fileName);`
	`5580`	`+ return SFTP_GetAttributesHelper(fs, atr, fileName);`
`5577`	`5581`	`}`
`5578`	`5582`
`5579`	`5583`
`@@ -5587,9 +5591,8 @@ static int SFTP_GetAttributes(void* fs, const char* fileName,`
`5587`	`5591`	`static int SFTP_GetAttributes_Handle(WOLFSSH* ssh, WFD fd,`
`5588`	`5592`	`char* name, WS_SFTP_FILEATRB* atr)`
`5589`	`5593`	`{`
`5590`		`- WOLFSSH_UNUSED(ssh);`
`5591`	`5594`	`WOLFSSH_UNUSED(fd);`
`5592`		`- return SFTP_GetAttributesHelper(atr, name);`
	`5595`	`+ return SFTP_GetAttributesHelper(ssh->fs, atr, name);`
`5593`	`5596`	`}`
`5594`	`5597`	`#endif /* !NO_WOLFSSH_SERVER */`
`5595`	`5598`