fix dup3 ignoring all flags but O_CLOEXEC on archs with SYS_dup2 syscall

[musl] / src / thread / pthread_setattr_default_np.c

diff --git a/src/thread/pthread_setattr_default_np.c b/src/thread/pthread_setattr_default_np.c
index 256f068..5848622 100644 (file)
--- a/src/thread/pthread_setattr_default_np.c
+++ b/src/thread/pthread_setattr_default_np.c
@@ -2,6 +2,9 @@
 #include "pthread_impl.h"
 #include <string.h>
 
+#define MIN(a,b) ((a)<(b) ? (a) : (b))
+#define MAX(a,b) ((a)>(b) ? (a) : (b))
+
 int pthread_setattr_default_np(const pthread_attr_t *attrp)
 {
        /* Reject anything in the attr object other than stack/guard size. */
@@ -11,11 +14,12 @@ int pthread_setattr_default_np(const pthread_attr_t *attrp)
        if (memcmp(&tmp, &zero, sizeof tmp))
                return EINVAL;
 
+       unsigned stack = MIN(attrp->_a_stacksize, DEFAULT_STACK_MAX);
+       unsigned guard = MIN(attrp->_a_guardsize, DEFAULT_GUARD_MAX);
+
        __inhibit_ptc();
-       if (attrp->_a_stacksize >= __default_stacksize)
-               __default_stacksize = attrp->_a_stacksize;
-       if (attrp->_a_guardsize >= __default_guardsize)
-               __default_guardsize = attrp->_a_guardsize;
+       __default_stacksize = MAX(__default_stacksize, stack);
+       __default_guardsize = MAX(__default_guardsize, guard);
        __release_ptc();
 
        return 0;