#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
* 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];
size_t k, l = strlen(name);
char *s;
int skip = 0;
+ int cs;
*res = 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 {
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';
*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;
}