From @bulk88

0001-WIP-don-t-closesocket-on-non-socket-handles.patch

From b431f923ee773478da393bb26dd45b07d1dbf7e8 Mon Sep 17 00:00:00 2001
From: Daniel Dragan <bulk88@hotmail.com>
Date: Sat, 23 Nov 2013 17:03:32 -0500
Subject: [PATCH] WIP don't closesocket on non-socket handles

---
 win32/win32.c    |   19 ++++++++++-
 win32/win32.h    |   29 ++++++++++++++++++
 win32/win32io.c  |    5 ++-
 win32/win32sck.c |   86 ++++++++++++++++++++++++++++++++++-------------------
 4 files changed, 105 insertions(+), 34 deletions(-)

diff --git a/win32/win32.c b/win32/win32.c
index fb24bbb..8a565d8 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3332,13 +3332,28 @@ win32_isatty(int fd)
 DllExport int
 win32_dup(int fd)
 {
-    return dup(fd);
+    int ret;
+    int old = _osfhnd(fd);
+    //DebugBreak();
+    ret = dup(fd);
+    if(ret != -1) {
+        int h = _osfhnd(ret);
+        assert(!SOCKET_FLAG_FROM_HANDLE(h));
+        _osfhnd(ret) |= SOCKET_FLAG_FROM_HANDLE(_osfhnd(fd));
+    }
+    return ret;
 }
 
 DllExport int
 win32_dup2(int fd1,int fd2)
 {
-    return dup2(fd1,fd2);
+    int ret = dup2(fd1,fd2);
+    if(ret != -1) {
+        int h = _osfhnd(fd2);
+        assert(!SOCKET_FLAG_FROM_HANDLE(h));
+        _osfhnd(fd2) |= SOCKET_FLAG_FROM_HANDLE(_osfhnd(fd1));
+    }
+    return ret;
 }
 
 DllExport int
diff --git a/win32/win32.h b/win32/win32.h
index a521a41..df51ffa 100644
--- a/win32/win32.h
+++ b/win32/win32.h
@@ -599,6 +599,35 @@ EXTERN_C _CRTIMP ioinfo* __pioinfo[];
 
 /* since we are not doing a dup2(), this works fine */
 #  define _set_osfhnd(fh, osfh) (void)(_osfhnd(fh) = (intptr_t)osfh)
+
+/* derived from IsConsoleHandle macro, (((ULONG_PTR)(h) & 0x10000003) == 0x3)
+   if low 2 bits are 11, then its a console psuedo handle that only Win32
+   subsystem understands, not a kernel handle, a kernel handle ends in 00, we
+   reserve 10 to mean socket handle, starting in Windows 8 according to reports
+   online, console handles are kernel handles, low 2 bits behaviour on Win8
+   consone handles is unresearched, 0x80000000 catches negative values are
+   other psuedo handles or invalid handle, meaning behind flag 0x10000000 is
+   unknown, 01 can not be used since 01 handles are listed as FILE_TYPE_UNKNOWN,
+   and the handle is not passed to a kernel call to determine its type, this
+   causes _fstati64 to fail, making open() from PP fail when opening a numeric
+   fd that contains 01 tagged handle
+*/
+
+//static void
+//PerlIOUnix_setfd(pTHX_ PerlIO *f, int fd, int imode)
+//{
+//    PerlIOUnix * const s = PerlIOSelf(f, PerlIOUnix);
+//#if defined(WIN32)
+//    Stat_t st;
+//    if (PerlLIO_fstat(fd, &st) == 0) { <<<<< calls GetFileType in CRT which makes fstat fail
+//        
+#  define HANDLE_IS_SCK 0x2
+#  define PSUEDO_HANDLES_MASK 0x90000003
+#  define IS_PSUEDO_HANDLE(h) ((ULONG_PTR)(h) & PSUEDO_HANDLES_MASK)
+#  define SOCKET_FLAG_FROM_HANDLE(h) ((IS_PSUEDO_HANDLE(h) == HANDLE_IS_SCK) ? HANDLE_IS_SCK : 0x0)
+/* slow, and does failing kernel calls, use only in DEBUGGING */
+#  define PUBLIC_IS_SOCKET(h) (GetFileType(h) == FILE_TYPE_PIPE && GetNamedPipeInfo(h, 0, 0, 0, 0) == 0)
+
 #endif /* PERL_CORE */
 
 /* IO.xs and POSIX.xs define PERLIO_NOT_STDIO to 1 */
diff --git a/win32/win32io.c b/win32/win32io.c
index d183e3b..817628e 100644
--- a/win32/win32io.c
+++ b/win32/win32io.c
@@ -321,7 +321,10 @@ PerlIOWin32_dup(pTHX_ PerlIO *f, PerlIO *o, CLONE_PARAMS *params, int flags)
  if (DuplicateHandle(proc, os->h, proc, &new_h, 0, FALSE,  DUPLICATE_SAME_ACCESS))
   {
    char mode[8];
-   int fd = win32_open_osfhandle((intptr_t) new_h, PerlIOUnix_oflags(PerlIO_modestr(o,mode)));
+   int fd;
+   assert(!(SOCKET_FLAG_FROM_HANDLE(new_h) || IS_PSUEDO_HANDLE(new_h)));
+   *((ULONG_PTR *)&new_h) |= SOCKET_FLAG_FROM_HANDLE(os->h);
+   fd = win32_open_osfhandle((intptr_t) new_h, PerlIOUnix_oflags(PerlIO_modestr(o,mode)));
    if (fd >= 0)
     {
      f = PerlIOBase_dup(aTHX_ f, o, params, flags);
diff --git a/win32/win32sck.c b/win32/win32sck.c
index 674add2..df92946 100644
--- a/win32/win32sck.c
+++ b/win32/win32sck.c
@@ -396,7 +396,11 @@ win32_accept(SOCKET s, struct sockaddr *addr, int *addrlen)
     SOCKET r;
 
     SOCKET_TEST((r = accept(TO_SOCKET(s), addr, addrlen)), INVALID_SOCKET);
-    return OPEN_SOCKET(r);
+    assert(!(SOCKET_FLAG_FROM_HANDLE(r) || IS_PSUEDO_HANDLE(r)));
+    r = OPEN_SOCKET(r);
+    if( r != -1)
+        _osfhnd(r) |= HANDLE_IS_SCK;
+    return r;
 }
 
 int
@@ -670,8 +674,13 @@ win32_socket(int af, int type, int protocol)
 
     if((s = open_ifs_socket(af, type, protocol)) == INVALID_SOCKET)
 	errno = get_last_socket_error();
-    else
+    else {
+        assert(!(SOCKET_FLAG_FROM_HANDLE(s) || IS_PSUEDO_HANDLE(s)));
+        /* _open_osfhandle does a GetFileType which bans handles ending in 01 */
 	s = OPEN_SOCKET(s);
+        if( s != -1)
+            _osfhnd(s) |= HANDLE_IS_SCK;
+    }
 
     return s;
 }
@@ -690,21 +699,28 @@ int my_close(int fd)
 	return(close(fd));	/* Then not a socket. */
     osf = TO_SOCKET(fd);/* Get it now before it's gone! */
     if (osf != -1) {
-	int err;
-	err = closesocket(osf);
-	if (err == 0) {
-	    assert(_osfhnd(fd) == osf); /* catch a bad ioinfo struct def */
-	    /* don't close freed handle */
-	    _set_osfhnd(fd, INVALID_HANDLE_VALUE);
-	    return close(fd);
+	if(SOCKET_FLAG_FROM_HANDLE(osf)) {
+            int err = closesocket(osf);
+            int err2 = closesocket(osf&~HANDLE_IS_SCK);
+            assert(err == err2);  /* ???? */
+            if (err == 0) {
+                assert(_osfhnd(fd) == osf); /* catch a bad ioinfo struct def */
+                /* don't close freed handle */
+                _set_osfhnd(fd, INVALID_HANDLE_VALUE);
+                return close(fd);
+            }
+            else if (err == SOCKET_ERROR) {
+                err = get_last_socket_error();
+                assert(err != ENOTSOCK);
+                /* note this does a not allowed by MS CloseHandle
+                   on the socket handle */
+                (void)close(fd);
+                errno = err;
+                return EOF;
+            }
 	}
-	else if (err == SOCKET_ERROR) {
-	    err = get_last_socket_error();
-	    if (err != ENOTSOCK) {
-		(void)close(fd);
-		errno = err;
-		return EOF;
-	    }
+	else {
+	    assert(!PUBLIC_IS_SOCKET(osf));
 	}
     }
     return close(fd);
@@ -721,21 +737,29 @@ my_fclose (FILE *pf)
     if (osf != -1) {
 	int err;
 	win32_fflush(pf);
-	err = closesocket(osf);
-	if (err == 0) {
-	    assert(_osfhnd(win32_fileno(pf)) == osf); /* catch a bad ioinfo struct def */
-	    /* don't close freed handle */
-	    _set_osfhnd(win32_fileno(pf), INVALID_HANDLE_VALUE);
-	    return fclose(pf);
-	}
-	else if (err == SOCKET_ERROR) {
-	    err = get_last_socket_error();
-	    if (err != ENOTSOCK) {
-		(void)fclose(pf);
-		errno = err;
-		return EOF;
-	    }
-	}
+        if(SOCKET_FLAG_FROM_HANDLE(osf)) {
+            int err = closesocket(osf);
+            int err2 = closesocket(osf&~HANDLE_IS_SCK);
+            assert(err == err2); /* ???? */
+            if (err == 0) {
+                assert(_osfhnd(win32_fileno(pf)) == osf); /* catch a bad ioinfo struct def */
+                /* don't close freed handle */
+                _set_osfhnd(win32_fileno(pf), INVALID_HANDLE_VALUE);
+                return fclose(pf);
+            }
+            else if (err == SOCKET_ERROR) {
+                err = get_last_socket_error();
+                assert(err != ENOTSOCK);
+                /* note this does a not allowed by MS CloseHandle
+                   on the socket handle */
+                (void)fclose(pf);
+                errno = err;
+                return EOF;
+            }
+        }
+        else {
+            assert(!PUBLIC_IS_SOCKET(osf));
+        }
     }
     return fclose(pf);
 }
-- 
1.7.9.msysgit.0

Perl crash when run under AppVerifier #12986

Description

Metadata

Metadata

Assignees

Labels

Type

Projects

Milestone

Relationships

Development

Issue actions