d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chpass: reject change/expiry dates beyond y2106

Browse Source 
The pwd.db and spwd.db files store the change and expire dates as
unsigned 32-bit ints, which overflow in 2106.  Reject larger values for
now, until the introduction of a v5 password database.

i386 has 32-bit time_t and so dates beyond y2038 are already rejected by
mktime.

PR:		227589
Reviewed by:	lidl
MFC after:	1 week
Sponsored by:	The FreeBSD Foundation
This commit is contained in:
Ed Maste 2018-04-19 12:50:49 +00:00
parent f3f6ecb450
commit ba85da072b
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
usr.bin/chpass/util.c
View File

@ -51,6 +51,7 @@ __FBSDID("$FreeBSD$");
#include <sys/types.h>
#include <ctype.h>
#include <stdint.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@ -136,6 +137,17 @@ bad: return (1);
lt->tm_isdst = -1;
if ((tval = mktime(lt)) < 0)
return (1);
#ifndef __i386__
/*
* PR227589: The pwd.db and spwd.db files store the change and expire
* dates as unsigned 32-bit ints which overflow in 2106, so larger
* values must be rejected until the introduction of a v5 password
* database. i386 has 32-bit time_t and so dates beyond y2038 are
* already rejected by mktime above.
*/
if (tval > UINT32_MAX)
return (1);
#endif
*store = tval;
return (0);
}