shadow password fixes: empty fields should read as -1 not 0

[musl] / src / passwd / getspnam_r.c

diff --git a/src/passwd/getspnam_r.c b/src/passwd/getspnam_r.c
index d21ca81..9e29aa9 100644 (file)
--- a/src/passwd/getspnam_r.c
+++ b/src/passwd/getspnam_r.c
@@ -1,6 +1,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <sys/stat.h>

+#include <ctype.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


@@ -10,6 +11,11 @@
  * 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;
+}
+

 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];


@@ -64,25 +70,25 @@ 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 = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_min = atol(s);
+               *s++ = 0; sp->sp_min = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_max = atol(s);
+               *s++ = 0; sp->sp_max = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_warn = atol(s);
+               *s++ = 0; sp->sp_warn = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_inact = atol(s);
+               *s++ = 0; sp->sp_inact = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_expire = atol(s);
+               *s++ = 0; sp->sp_expire = xatol(s);

                if (!(s = strchr(s, ':'))) continue;
 
                if (!(s = strchr(s, ':'))) continue;
 

-               *s++ = 0; sp->sp_flag = atol(s);
+               *s++ = 0; sp->sp_flag = xatol(s);

                *res = sp;
                break;
        }
                *res = sp;
                break;
        }