From 893ac8e03c21d246bbfc8d575a227d8c65cfae76 Mon Sep 17 00:00:00 2001
From: Christopher Faylor <me@cgf.cx>
Date: Sun, 3 Jul 2005 02:40:30 +0000
Subject: 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.

---
 winsup/cygwin/sem.cc | 22 +++++-----------------
 1 file changed, 5 insertions(+), 17 deletions(-)

(limited to 'winsup/cygwin/sem.cc')

diff --git a/winsup/cygwin/sem.cc b/winsup/cygwin/sem.cc
index 1d7f53c67..ea617f664 100644
--- a/winsup/cygwin/sem.cc
+++ b/winsup/cygwin/sem.cc
@@ -21,6 +21,7 @@ details. */
 
 #include "cygserver_ipc.h"
 #include "cygserver_sem.h"
+#include "cygtls.h"
 
 /*
  * client_request_sem Constructors
@@ -93,22 +94,8 @@ semctl (int semid, int semnum, int cmd, ...)
     }
   syscall_printf ("semctl (semid = %d, semnum = %d, cmd = %d, arg.val = 0x%x)",
 		  semid, semnum, cmd, arg.val);
-  if ((cmd == IPC_STAT || cmd == IPC_SET)
-      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct semid_ds)))
-    return -1;
-  if (cmd == IPC_INFO)
-    {
-      /* semid == 0: Request for seminfo struct. */
-      if (!semid
-	  && __check_null_invalid_struct_errno (arg.buf, sizeof (struct seminfo)))
-	  return -1;
-      /* Otherwise, request semid entries from internal semid_ds array. */
-      if (semid)
-	if (__check_null_invalid_struct_errno (arg.buf, semid * sizeof (struct semid_ds)))
-	  return -1;
-    }
-  if (cmd == SEM_INFO
-      && __check_null_invalid_struct_errno (arg.buf, sizeof (struct sem_info)))
+  myfault efault;
+  if (efault.faulted (EFAULT))
     return -1;
   client_request_sem request (semid, semnum, cmd, &arg);
   if (request.make_request () == -1 || request.retval () == -1)
@@ -156,7 +143,8 @@ semop (int semid, struct sembuf *sops, size_t nsops)
 #ifdef USE_SERVER
   syscall_printf ("semop (semid = %d, sops = %p, nsops = %d)",
 		  semid, sops, nsops);
-  if (__check_null_invalid_struct_errno (sops, nsops * sizeof (struct sembuf)))
+  myfault efault;
+  if (efault.faulted (EFAULT))
     return -1;
   client_request_sem request (semid, sops, nsops);
   if (request.make_request () == -1 || request.retval () == -1)
-- 
cgit v1.2.3