Replace valid memory checks with new myfault class "exception handling", almost

everywhere.  Leave some thread.cc stuff alone for now.
* cygtls.h: Kludge some definitions to avoid including a problematic windows
header.
(_cygtls::_myfault): New entry.
(_cygtls::_myfault_errno): Ditto.
(_cygtls::fault_guarded): New function.
(_cygtls::setup_fault): Ditto.
(_cygtls::return_from_fault): Ditto.
(_cygtls::clear_fault): Ditto.
(myfault): New class.
* exceptions.cc (handle_exceptions): Handle case of guarded fault in system
routine.
* gendef: Add another entry point for setjmp that the compiler doesn't know
about and won't complain about.
* gentls_offsets: Just include windows.h rather than kludging a HANDLE def.
* miscfuncs.cc (check_null_str): Delete.
(check_null_empty_str): Ditto.
(check_null_empty_str_errno): Ditto.
(check_null_str_errno): Ditto.
(__check_null_invalid_struct): Ditto.
(__check_null_invalid_struct_errno): Ditto.
(__check_invalid_read_ptr): Ditto.
(__check_invalid_read_ptr_errno): Ditto.
(dummytest): New function.
(check_iovec_for_read): Delete.
(chec_iovec): Rename from check_iovec_for_write.  Take a read/write parameter.
* tlsoffsets.h: Regenerate.
* winsup.h: Remove check_* declarations.
(check_iovec_for_read): Delete declaration.  Turn into a define instead.
(check_iovec_for_write): Ditto.
(check_iovec): New declaration.
* thread.h: Use ifdef guard name consistent with other header files.

1 files changed, 4 insertions, 22 deletions

diff --git a/winsup/cygwin/shm.cc b/winsup/cygwin/shm.cc
index 89846914a..f6cc30baf 100644
--- a/winsup/cygwin/shm.cc
+++ b/winsup/cygwin/shm.cc
@@ -22,6 +22,7 @@ details. */
 
 #include "cygserver_ipc.h"
 #include "cygserver_shm.h"
+#include "cygtls.h"
 
 /*
  * client_request_shm Constructors
@@ -244,28 +245,9 @@ shmctl (int shmid, int cmd, struct shmid_ds *buf)
 #ifdef USE_SERVER
   syscall_printf ("shmctl (shmid = %d, cmd = %d, buf = 0x%x)",
 		  shmid, cmd, buf);
-  switch (cmd)
-    {
-      case IPC_STAT:
-      case IPC_SET:
-	if (__check_null_invalid_struct_errno (buf, sizeof (struct shmid_ds)))
-	  return -1;
-	break;
-      case IPC_INFO:
-	/* shmid == 0: Request for shminfo struct. */
-	if (!shmid
-	    && __check_null_invalid_struct_errno (buf, sizeof (struct shminfo)))
-	    return -1;
-	/* Otherwise, request shmid entries from internal shmid_ds array. */
-	if (shmid)
-	  if (__check_null_invalid_struct_errno (buf, shmid * sizeof (struct shmid_ds)))
-	    return -1;
-	break;
-      case SHM_INFO:
-	if (__check_null_invalid_struct_errno (buf, sizeof (struct shm_info)))
-	  return -1;
-	break;
-    }
+  myfault efault;
+  if (efault.faulted (EFAULT))
+    return -1;
   client_request_shm request (shmid, cmd, buf);
   if (request.make_request () == -1 || request.retval () == -1)
     {