math: tgammal.c fixes

[musl] / src / passwd / getspnam_r.c

diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c
index d21ca81..f4d7b35 100644 (file)
--- a/src/passwd/getspnam_r.c
+++ b/src/passwd/getspnam_r.c
@@ -1,6 +1,8 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
+#include <ctype.h>
+#include <pthread.h>
 #include "pwf.h"
 
 /* This implementation support Openwall-style TCB passwords in place of
@@ -10,6 +12,16 @@
  * file. It also avoids any allocation to prevent memory-exhaustion
  * attacks via huge TCB shadow files. */
 
+static long xatol(const char *s)
+{
+       return isdigit(*s) ? atol(s) : -1;
+}
+
+static void cleanup(void *p)
+{
+       fclose(p);
+}
+
 int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct spwd **res)
 {
        char path[20+NAME_MAX];
@@ -19,6 +31,7 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
        size_t k, l = strlen(name);
        char *s;
        int skip = 0;
+       int cs;
 
        *res = 0;
 
@@ -33,19 +46,22 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
        if (snprintf(path, sizeof path, "/etc/tcb/%s/shadow", name) >= sizeof path)
                return EINVAL;
 
-       fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK);
+       fd = open(path, O_RDONLY|O_NOFOLLOW|O_NONBLOCK|O_CLOEXEC);
        if (fd >= 0) {
                struct stat st = { 0 };
                errno = EINVAL;
                if (fstat(fd, &st) || !S_ISREG(st.st_mode) || !(f = fdopen(fd, "rb"))) {
+                       pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
                        close(fd);
+                       pthread_setcancelstate(cs, 0);
                        return errno;
                }
        } else {
-               f = fopen("/etc/shadow", "rb");
+               f = fopen("/etc/shadow", "rbe");
                if (!f) return errno;
        }
 
+       pthread_cleanup_push(cleanup, f);
        while (fgets(buf, size, f) && (k=strlen(buf))>0) {
                if (skip || strncmp(name, buf, l)) {
                        skip = buf[k-1] != '\n';
@@ -64,28 +80,28 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
                *s++ = 0; sp->sp_pwdp = s;
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_lstchg = atol(s);
+               *s++ = 0; sp->sp_lstchg = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_min = atol(s);
+               *s++ = 0; sp->sp_min = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_max = atol(s);
+               *s++ = 0; sp->sp_max = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_warn = atol(s);
+               *s++ = 0; sp->sp_warn = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_inact = atol(s);
+               *s++ = 0; sp->sp_inact = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_expire = atol(s);
+               *s++ = 0; sp->sp_expire = xatol(s);
                if (!(s = strchr(s, ':'))) continue;
 
-               *s++ = 0; sp->sp_flag = atol(s);
+               *s++ = 0; sp->sp_flag = xatol(s);
                *res = sp;
                break;
        }
-       fclose(f);
+       pthread_cleanup_pop(1);
        return rv;
 }