Fixes the Valgrind implementation of getrlimit/setrlimit

coregrind/m_syswrap/syswrap-generic.c

 
 /*--------------------------------------------------------------------*/
 /*--- Wrappers for generic Unix system calls     syswrap-generic.c ---*/
 /*--------------------------------------------------------------------*/
 
 /*
    This file is part of Valgrind, a dynamic binary instrumentation
    framework.
 
    Copyright (C) 2000-2009 Julian Seward 
@@ skipping 3089 matching lines @@
 PRE(sys_getppid)
 {
    PRINT("sys_getppid ()");
    PRE_REG_READ0(long, "getppid");
 }
 
 static void common_post_getrlimit(ThreadId tid, UWord a1, UWord a2)
 {
    POST_MEM_WRITE( a2, sizeof(struct vki_rlimit) );
 
+#ifdef _RLIMIT_POSIX_FLAG
+   /* Darwin will sometimes set _RLIMIT_POSIX_FLAG on getrlimit calls.
+    * Unset it here to make the switch case below work correctly.
+    * _RLIMIT_POSIX_FLAG is defined in sys/resource.h and is only
+    * present on Darwin.
+    */
+   a1 &= ~_RLIMIT_POSIX_FLAG;
+#endif
+
    switch (a1) {
    case VKI_RLIMIT_NOFILE:
       ((struct vki_rlimit *)a2)->rlim_cur = VG_(fd_soft_limit);
       ((struct vki_rlimit *)a2)->rlim_max = VG_(fd_hard_limit);
       break;
 
    case VKI_RLIMIT_DATA:
       *((struct vki_rlimit *)a2) = VG_(client_rlimit_data);
       break;
 
@@ skipping 699 matching lines @@
 }
 
 PRE(sys_setreuid)
 {
    PRINT("sys_setreuid ( 0x%lx, 0x%lx )", ARG1, ARG2);
    PRE_REG_READ2(long, "setreuid", vki_uid_t, ruid, vki_uid_t, euid);
 }
 
 PRE(sys_setrlimit)
 {
+   UWord arg1 = ARG1;
    PRINT("sys_setrlimit ( %ld, %#lx )", ARG1,ARG2);
    PRE_REG_READ2(long, "setrlimit",
                  unsigned int, resource, struct rlimit *, rlim);
    PRE_MEM_READ( "setrlimit(rlim)", ARG2, sizeof(struct vki_rlimit) );
 
-   if (ARG1 == VKI_RLIMIT_NOFILE) {
+#ifdef _RLIMIT_POSIX_FLAG
+   /* Darwin will sometimes set _RLIMIT_POSIX_FLAG on setrlimit calls.
+    * Unset it here to make the if statements below work correctly.
+    * _RLIMIT_POSIX_FLAG is defined in sys/resource.h and is only
+    * present on Darwin.
+    */
+   arg1 &= ~_RLIMIT_POSIX_FLAG;
+#endif
+
+   if (arg1 == VKI_RLIMIT_NOFILE) {
       if (((struct vki_rlimit *)ARG2)->rlim_cur > VG_(fd_hard_limit) ||
           ((struct vki_rlimit *)ARG2)->rlim_max != VG_(fd_hard_limit)) {
          SET_STATUS_Failure( VKI_EPERM );
       }
       else {
          VG_(fd_soft_limit) = ((struct vki_rlimit *)ARG2)->rlim_cur;
          SET_STATUS_Success( 0 );
       }
    }
-   else if (ARG1 == VKI_RLIMIT_DATA) {
+   else if (arg1 == VKI_RLIMIT_DATA) {
       if (((struct vki_rlimit *)ARG2)->rlim_cur > VG_(client_rlimit_data).rlim_max ||
           ((struct vki_rlimit *)ARG2)->rlim_max > VG_(client_rlimit_data).rlim_max) {
          SET_STATUS_Failure( VKI_EPERM );
       }
       else {
          VG_(client_rlimit_data) = *(struct vki_rlimit *)ARG2;
          SET_STATUS_Success( 0 );
       }
    }
-   else if (ARG1 == VKI_RLIMIT_STACK && tid == 1) {
+   else if (arg1 == VKI_RLIMIT_STACK && tid == 1) {
       if (((struct vki_rlimit *)ARG2)->rlim_cur > VG_(client_rlimit_stack).rlim_max ||
           ((struct vki_rlimit *)ARG2)->rlim_max > VG_(client_rlimit_stack).rlim_max) {
          SET_STATUS_Failure( VKI_EPERM );
       }
       else {
          VG_(threads)[tid].client_stack_szB = ((struct vki_rlimit *)ARG2)->rlim_cur;
          VG_(client_rlimit_stack) = *(struct vki_rlimit *)ARG2;
          SET_STATUS_Success( 0 );
       }
    }
@@ skipping 228 matching lines @@
       POST_MEM_WRITE( ARG2, sizeof(vki_stack_t));
 }
 
 #undef PRE
 #undef POST
 
 /*--------------------------------------------------------------------*/
 /*--- end                                                          ---*/
 /*--------------------------------------------------------------------*/