Merge pull request #486 from spolack/socket-fix-fd-on-64bit-big-endian

socket: fix the file descriptor on 64-bit big-endian

Author: jow-

lib/socket.c

@@ -181,7 +181,7 @@ args_get_(uc_vm_t *vm, size_t nargs, int *fdptr, ...)
 	uc_value_t **ptr, *arg;
 	uc_type_t type, t;
 	size_t index = 0;
-	int *sockfd;
+	intptr_t *sockfd;
 	va_list ap;
 	bool opt;
 
@@ -943,9 +943,9 @@ static bool
 uv_to_fileno(uc_vm_t *vm, uc_value_t *val, int *fileno)
 {
 	uc_value_t *fn;
-	int *fdptr;
+	intptr_t *fdptr;
 
-	fdptr = (int *)ucv_resource_dataptr(val, "socket");
+	fdptr = (intptr_t *)ucv_resource_dataptr(val, "socket");
 
 	if (fdptr) {
 		if (*fdptr < 0)
@@ -5078,12 +5078,16 @@ uc_socket_inst_sockname(uc_vm_t *vm, size_t nargs)
 static uc_value_t *
 uc_socket_inst_close(uc_vm_t *vm, size_t nargs)
 {
-	int *sockfd = uc_fn_this("socket");
+	intptr_t *sockfd = uc_fn_this("socket");
+	int fd;
 
 	if (!sockfd || *sockfd == -1)
 		err_return(EBADF, "Invalid socket context");
 
-	if (!xclose(sockfd))
+	fd = *sockfd;
+	*sockfd = -1;
+
+	if (!xclose(&fd))
 		err_return(errno, "close()");
 
 	ok_return(ucv_boolean_new(true));

tests/custom/08_lib_socket/01_fileno_close

@@ -0,0 +1,43 @@
+Test that a socket reports and closes its own file descriptor.
+
+The descriptor is stored in the data pointer of the socket resource and
+was read back through an `int *`. On 64-bit big-endian systems that
+yields the upper half of the pointer: `fileno()` returned 0 for every
+socket and `close()` closed descriptor 0 instead of the socket.
+
+The failure only shows on a 64-bit big-endian build, on other systems
+this test passes regardless of the fix.
+
+-- Testcase --
+{%
+	import * as socket from 'socket';
+	import * as fs from 'fs';
+
+	let s1 = socket.create(socket.AF_INET, socket.SOCK_DGRAM, 0);
+	let s2 = socket.create(socket.AF_INET, socket.SOCK_DGRAM, 0);
+	let fd1 = s1.fileno(), fd2 = s2.fileno();
+
+	printf("fds_valid=%s fds_distinct=%s\n",
+		(fd1 > 2 && fd2 > 2) ? "yes" : "no",
+		(fd1 != fd2) ? "yes" : "no");
+
+	printf("close=%s\n", s1.close());
+	printf("fd_released=%s\n", fs.stat(`/proc/self/fd/${fd1}`) == null ? "yes" : "no");
+	printf("stdin_open=%s\n", fs.stat("/proc/self/fd/0") != null ? "yes" : "no");
+
+	printf("fileno_after_close=%J error=%s\n", s1.fileno(), socket.error());
+	printf("close_after_close=%J error=%s\n", s1.close(), socket.error());
+
+	printf("other_socket_intact=%s\n", s2.fileno() == fd2 ? "yes" : "no");
+%}
+-- End --
+
+-- Expect stdout --
+fds_valid=yes fds_distinct=yes
+close=true
+fd_released=yes
+stdin_open=yes
+fileno_after_close=null error=Invalid socket context: Bad file descriptor
+close_after_close=null error=Invalid socket context: Bad file descriptor
+other_socket_intact=yes
+-- End --