diff --git a/core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h b/core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h
index 78eb457f5..98ccc78c1 100644
--- a/core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h
+++ b/core/iwasm/libraries/lib-socket/inc/wasi_socket_ext.h
@@ -135,6 +135,28 @@ typedef struct __wasi_addr_info_hints_t {
 #define IPV6_LEAVE_GROUP 21
 #define IPV6_V6ONLY 26
 
+/* getaddrinfo error codes.
+ *
+ * we use values compatible with wasi-libc/musl netdb.h.
+ * https://github.com/WebAssembly/wasi-libc/blob/4ea6fdfa288e15a57c02fe31dda78e5ddc87c3c7/libc-top-half/musl/include/netdb.h#L43-L53
+ *
+ * for now, non-posix error codes are excluded:
+ * EAI_PROTOCOL and EAI_BADHINTS (BSDs)
+ * EAI_ADDRFAMILY, EAI_NODATA
+ * https://github.com/WebAssembly/wasi-libc/blob/4ea6fdfa288e15a57c02fe31dda78e5ddc87c3c7/libc-top-half/musl/include/netdb.h#L145-L152
+ */
+
+#define EAI_AGAIN -3
+#define EAI_BADFLAGS -1
+#define EAI_FAIL -4
+#define EAI_FAMILY -6
+#define EAI_MEMORY -10
+#define EAI_NONAME -2
+#define EAI_OVERFLOW -12
+#define EAI_SERVICE -8
+#define EAI_SOCKTYPE -7
+#define EAI_SYSTEM -11
+
 struct addrinfo {
     int ai_flags;             /* Input flags.  */
     int ai_family;            /* Protocol family for socket.  */
diff --git a/core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c b/core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c
index 9770e77b4..f016bdebc 100644
--- a/core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c
+++ b/core/iwasm/libraries/lib-socket/src/wasi/wasi_socket_ext.c
@@ -38,6 +38,13 @@ __errno_location(void);
         return -1;                       \
     }
 
+/* REVISIT: in many cases, EAI_SYSTEM may not be an ideal error code */
+#define GAI_HANDLE_ERROR(error)          \
+    if (error != __WASI_ERRNO_SUCCESS) { \
+        errno = error;                   \
+        return EAI_SYSTEM;               \
+    }
+
 static void
 ipv4_addr_to_wasi_ip4_addr(uint32_t addr_num, __wasi_addr_ip4_t *out)
 {
@@ -518,7 +525,7 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
     struct aibuf *aibuf_res;
 
     error = addrinfo_hints_to_wasi_hints(hints, &wasi_hints);
-    HANDLE_ERROR(error)
+    GAI_HANDLE_ERROR(error)
 
     do {
         if (addr_info)
@@ -529,7 +536,7 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
                                                  * sizeof(__wasi_addr_info_t));
 
         if (!addr_info) {
-            HANDLE_ERROR(__WASI_ERRNO_NOMEM)
+            return EAI_MEMORY;
         }
 
         error = __wasi_sock_addr_resolve(node, service == NULL ? "" : service,
@@ -537,21 +544,21 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
                                          &max_info_size);
         if (error != __WASI_ERRNO_SUCCESS) {
             free(addr_info);
-            HANDLE_ERROR(error);
+            GAI_HANDLE_ERROR(error);
         }
     } while (max_info_size > addr_info_size);
 
     addr_info_size = max_info_size;
     if (addr_info_size == 0) {
         free(addr_info);
-        HANDLE_ERROR(__WASI_ERRNO_NOENT)
+        return EAI_NONAME;
     }
 
     aibuf_res =
         (struct aibuf *)calloc(1, addr_info_size * sizeof(struct aibuf));
     if (!aibuf_res) {
         free(addr_info);
-        HANDLE_ERROR(__WASI_ERRNO_NOMEM)
+        return EAI_MEMORY;
     }
 
     *res = &aibuf_res[0].ai;
@@ -564,14 +571,14 @@ getaddrinfo(const char *node, const char *service, const struct addrinfo *hints,
         if (error != __WASI_ERRNO_SUCCESS) {
             free(addr_info);
             free(aibuf_res);
-            HANDLE_ERROR(error)
+            GAI_HANDLE_ERROR(error)
         }
         ai->ai_next = i == addr_info_size - 1 ? NULL : &aibuf_res[i + 1].ai;
     }
 
     free(addr_info);
 
-    return __WASI_ERRNO_SUCCESS;
+    return 0;
 }
 
 void