[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1385003621-10289-2-git-send-email-mforney@mforney.org>
Date: Wed, 20 Nov 2013 19:13:40 -0800
From: Michael Forney <mforney@...rney.org>
To: musl@...ts.openwall.com
Subject: [PATCH 1/2] shadow: Move spent parsing to internal function
---
src/passwd/getspnam_r.c | 34 +---------------------------------
src/passwd/parsespent.c | 42 ++++++++++++++++++++++++++++++++++++++++++
src/passwd/pwf.h | 2 +-
3 files changed, 44 insertions(+), 34 deletions(-)
create mode 100644 src/passwd/parsespent.c
diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c
index f4d7b35..59a84b3 100644
--- a/src/passwd/getspnam_r.c
+++ b/src/passwd/getspnam_r.c
@@ -12,11 +12,6 @@
* 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);
@@ -29,7 +24,6 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
int rv = 0;
int fd;
size_t k, l = strlen(name);
- char *s;
int skip = 0;
int cs;
@@ -71,34 +65,8 @@ int getspnam_r(const char *name, struct spwd *sp, char *buf, size_t size, struct
rv = ERANGE;
break;
}
- buf[k-1] = 0;
-
- s = buf;
- sp->sp_namp = s;
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_pwdp = s;
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_lstchg = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_min = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_max = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_warn = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_inact = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
-
- *s++ = 0; sp->sp_expire = xatol(s);
- if (!(s = strchr(s, ':'))) continue;
- *s++ = 0; sp->sp_flag = xatol(s);
+ if (__parsespent(buf, sp) < 0) continue;
*res = sp;
break;
}
diff --git a/src/passwd/parsespent.c b/src/passwd/parsespent.c
new file mode 100644
index 0000000..d781387
--- /dev/null
+++ b/src/passwd/parsespent.c
@@ -0,0 +1,42 @@
+#include "pwf.h"
+
+static long xatol(char **s)
+{
+ long x;
+ if (**s == ':' || **s == '\n') return -1;
+ for (x=0; **s-'0'<10U; ++*s) x=10*x+(**s-'0');
+ return x;
+}
+
+int __parsespent(char *s, struct spwd *sp)
+{
+ sp->sp_namp = s;
+ if (!(s = strchr(s, ':'))) return -1;
+ *s = 0;
+
+ sp->sp_pwdp = ++s;
+ if (!(s = strchr(s, ':'))) return -1;
+ *s = 0;
+
+ s++; sp->sp_lstchg = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_min = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_max = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_warn = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_inact = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_expire = xatol(&s);
+ if (*s != ':') return -1;
+
+ s++; sp->sp_flag = xatol(&s);
+ if (*s != '\n') return -1;
+ return 0;
+}
diff --git a/src/passwd/pwf.h b/src/passwd/pwf.h
index 0a76ef8..2d813ad 100644
--- a/src/passwd/pwf.h
+++ b/src/passwd/pwf.h
@@ -9,5 +9,5 @@
#include "libc.h"
struct passwd *__getpwent_a(FILE *f, struct passwd *pw, char **line, size_t *size);
-struct spwd *__getspent_a(FILE *f, struct spwd *sp, char **line, size_t *size);
struct group *__getgrent_a(FILE *f, struct group *gr, char **line, size_t *size, char ***mem, size_t *nmem);
+int __parsespent(char *s, struct spwd *sp);
--
1.8.4.2
Powered by blists - more mailing lists
Confused about mailing lists and their use?
Read about mailing lists on Wikipedia
and check out these
guidelines on proper formatting of your messages.
