fix sys_getcwd (#8852)

xiao-mang · web-flow · commit 75f41723cb10 · 2024-04-25T18:28:53.000+08:00
diff --git a/components/lwp/lwp_syscall.c b/components/lwp/lwp_syscall.c
@@ -4718,9 +4718,10 @@ sysret_t sys_gethostbyname2_r(const char *name, int af, struct hostent *ret,
 }
 #endif
 
-char *sys_getcwd(char *buf, size_t size)
+long sys_getcwd(char *buf, size_t size)
 {
-    char *tmp, *ret = RT_NULL;
+    char *tmp = RT_NULL;
+    long ret = -1;
 
     if (!lwp_user_accessable((void *)buf, size))
     {
@@ -4737,7 +4738,10 @@ char *sys_getcwd(char *buf, size_t size)
     {
         if (lwp_put_to_user(buf, tmp, size) > 0)
         {
-            ret = buf;
+            if (buf != RT_NULL)
+                ret = strlen(buf);
+            else
+                ret = -EFAULT;
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -4718,9 +4718,10 @@ sysret_t sys_gethostbyname2_r(const char name, int af, struct hostent ret,`
`4718`	`4718`	`}`
`4719`	`4719`	`#endif`
`4720`	`4720`
`4721`		`-char sys_getcwd(char buf, size_t size)`
	`4721`	`+long sys_getcwd(char *buf, size_t size)`
`4722`	`4722`	`{`
`4723`		`- char tmp, ret = RT_NULL;`
	`4723`	`+ char *tmp = RT_NULL;`
	`4724`	`+ long ret = -1;`
`4724`	`4725`
`4725`	`4726`	`if (!lwp_user_accessable((void *)buf, size))`
`4726`	`4727`	`{`
`@@ -4737,7 +4738,10 @@ char sys_getcwd(char buf, size_t size)`
`4737`	`4738`	`{`
`4738`	`4739`	`if (lwp_put_to_user(buf, tmp, size) > 0)`
`4739`	`4740`	`{`
`4740`		`- ret = buf;`
	`4741`	`+ if (buf != RT_NULL)`
	`4742`	`+ ret = strlen(buf);`
	`4743`	`+ else`
	`4744`	`+ ret = -EFAULT;`
`4741`	`4745`	`}`
`4742`	`4746`	`}`
`4743`	`4747`