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, 7 insertions, 14 deletions

diff --git a/winsup/cygwin/fhandler_tape.cc b/winsup/cygwin/fhandler_tape.cc
index 1c7f5aa9e..2b1d458b2 100644
--- a/winsup/cygwin/fhandler_tape.cc
+++ b/winsup/cygwin/fhandler_tape.cc
@@ -10,6 +10,7 @@ Cygwin license.  Please consult the file "CYGWIN_LICENSE" for
 details. */
 
 #include "winsup.h"
+#include "cygtls.h"
 #include <sys/termios.h>
 #include <unistd.h>
 #include <stdlib.h>
@@ -967,10 +968,11 @@ mtinfo_drive::set_options (HANDLE mt, long options)
 int
 mtinfo_drive::ioctl (HANDLE mt, unsigned int cmd, void *buf)
 {
+  myfault efault;
+  if (efault.faulted ())
+    return ERROR_NOACCESS;
   if (cmd == MTIOCTOP)
     {
-      if (__check_invalid_read_ptr (buf, sizeof (struct mtop)))
-	return ERROR_NOACCESS;
       struct mtop *op = (struct mtop *) buf;
       if (lasterr == ERROR_BUS_RESET)
 	{
@@ -1115,18 +1117,9 @@ mtinfo_drive::ioctl (HANDLE mt, unsigned int cmd, void *buf)
 	}
     }
   else if (cmd == MTIOCGET)
-    {
-      if (__check_null_invalid_struct (buf, sizeof (struct mtget)))
-	return ERROR_NOACCESS;
-      get_status (mt, (struct mtget *) buf);
-    }
-  else if (cmd == MTIOCPOS)
-    {
-      if (__check_null_invalid_struct (buf, sizeof (struct mtpos)))
-	return ERROR_NOACCESS;
-      if (!get_pos (mt))
-	((struct mtpos *) buf)->mt_blkno = block;
-    }
+    get_status (mt, (struct mtget *) buf);
+  else if (cmd == MTIOCPOS && !get_pos (mt))
+    ((struct mtpos *) buf)->mt_blkno = block;
 
   return lasterr;
 }