modified nacl_sync.h to have NACL_WUR for all functions that return a

src/trusted/service_runtime/linux/x86/nacl_ldt.c

 /*
- * Copyright 2008 The Native Client Authors. All rights reserved.
- * Use of this source code is governed by a BSD-style license that can
- * be found in the LICENSE file.
+ * Copyright (c) 2011 The Native Client Authors. All rights reserved.
+ * Use of this source code is governed by a BSD-style license that can be
+ * found in the LICENSE file.
  */
 
 /*
  * NaCl local descriptor table manipulation support.
  */
 
 #include <asm/ldt.h>
 #include <stdio.h>
 
 #include "native_client/src/shared/platform/nacl_sync.h"
+#include "native_client/src/shared/platform/nacl_sync_checked.h"
 #include "native_client/src/trusted/service_runtime/arch/x86/nacl_ldt_x86.h"
 
 
 /*
  * struct LdtEntry is a structure that is laid out exactly as the segment
  * descriptors described in the Intel reference manuals.  This is needed
  * because Mac and Windows use this representation in the methods used to
  * set and get entries in the local descriptor table (LDT), but use different
  * names for the members.  Linux uses a different representation to set, but
  * also reads entries back in this format.  It needs to be laid out packed,
@@ skipping 62 matching lines @@
  */
 uint16_t NaClLdtAllocateSelector(int32_t entry_number,
                                  int size_is_in_pages,
                                  NaClLdtDescriptorType type,
                                  int read_exec_only,
                                  void* base_addr,
                                  uint32_t size_minus_one) {
   struct user_desc ud;
   int retval;
 
-  NaClMutexLock(&nacl_ldt_mutex);
+  NaClXMutexLock(&nacl_ldt_mutex);
 
   if (-1 == entry_number) {
     /* -1 means caller did not specify -- allocate */
     entry_number = NaClFindUnusedEntryNumber();
 
     if (-1 == entry_number) {
       /*
        * No free entries were available.
        */
       goto alloc_error;
@@ skipping 38 matching lines @@
    * Install the LDT entry.
    */
   retval = modify_ldt(1, &ud, sizeof ud);
   if (-1 == retval) {
     goto alloc_error;
   }
 
   /*
    * Return an LDT selector with a requested privilege level of 3.
    */
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
   return (ud.entry_number << 3) | 0x7;
 
   /*
    * All error returns go through this epilog.
    */
  alloc_error:
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
   return 0;
 }
 
 /*
  * Allocates a selector whose size is specified in pages.
  * Page granular protection requires that the start address be page-aligned.
  */
 uint16_t NaClLdtAllocatePageSelector(NaClLdtDescriptorType type,
                                      int read_exec_only,
                                      void* base_addr,
@@ skipping 97 matching lines @@
   struct user_desc ud;
   ud.entry_number = selector >> 3;
   ud.seg_not_present = 1;
   ud.base_addr = 0;
   ud.limit = 0;
   ud.limit_in_pages = 0;
   ud.read_exec_only = 0;
   ud.seg_32bit = 0;
   ud.useable = 0;
   ud.contents = MODIFY_LDT_CONTENTS_DATA;
-  NaClMutexLock(&nacl_ldt_mutex);
+  NaClXMutexLock(&nacl_ldt_mutex);
   modify_ldt(1, &ud, sizeof ud);
-  NaClMutexUnlock(&nacl_ldt_mutex);
+  NaClXMutexUnlock(&nacl_ldt_mutex);
 }