projects
/
musl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix off-by-one error in checks for implementation-internal signal numbers
[musl]
/
src
/
passwd
/
getspnam_r.c
diff --git
a/src/passwd/getspnam_r.c
b/src/passwd/getspnam_r.c
index
1dd39ce
..
f4d7b35
100644
(file)
--- a/
src/passwd/getspnam_r.c
+++ b/
src/passwd/getspnam_r.c
@@
-1,5
+1,8
@@
#include <fcntl.h>
#include <unistd.h>
#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
#include "pwf.h"
/* This implementation support Openwall-style TCB passwords in place of
@@
-9,6
+12,16
@@
* file. It also avoids any allocation to prevent memory-exhaustion
* attacks via huge TCB shadow files. */
* 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];
int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct spwd **res)
{
char path[20+NAME_MAX];
@@
-18,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;
size_t k, l = strlen(name);
char *s;
int skip = 0;
+ int cs;
*res = 0;
*res = 0;
@@
-32,18
+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;
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) {
if (fd >= 0) {
- f = fdopen(fd, "rb");
- if (!f) {
+ 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);
close(fd);
+ pthread_setcancelstate(cs, 0);
return errno;
}
} else {
return errno;
}
} else {
- f = fopen("/etc/shadow", "rb");
+ f = fopen("/etc/shadow", "rb
e
");
if (!f) return errno;
}
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';
while (fgets(buf, size, f) && (k=strlen(buf))>0) {
if (skip || strncmp(name, buf, l)) {
skip = buf[k-1] != '\n';
@@
-62,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_pwdp = s;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_lstchg = atol(s);
+ *s++ = 0; sp->sp_lstchg =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_min = atol(s);
+ *s++ = 0; sp->sp_min =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_max = atol(s);
+ *s++ = 0; sp->sp_max =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_warn = atol(s);
+ *s++ = 0; sp->sp_warn =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_inact = atol(s);
+ *s++ = 0; sp->sp_inact =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_expire = atol(s);
+ *s++ = 0; sp->sp_expire =
x
atol(s);
if (!(s = strchr(s, ':'))) continue;
if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_flag = atol(s);
+ *s++ = 0; sp->sp_flag =
x
atol(s);
*res = sp;
break;
}
*res = sp;
break;
}
-
fclose(f
);
+
pthread_cleanup_pop(1
);
return rv;
}
return rv;
}