mirror of
https://git.FreeBSD.org/src.git
synced 2025-01-17 15:27:36 +00:00
Disqualify UID/GID with non-numeric character.
PR: bin/41721 Reviewed by: tjr, silence on -audit MFC after: 2 weeks
This commit is contained in:
parent
4a63284e80
commit
05a7daf5ca
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=103958
@ -70,7 +70,7 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
||||
{
|
||||
uid_t id;
|
||||
int root;
|
||||
char *p, *sh;
|
||||
char *ep, *p, *sh;
|
||||
|
||||
if (pw_big_ids_warning == -1)
|
||||
pw_big_ids_warning = getenv("PW_SCAN_BIG_IDS") == NULL ? 1 : 0;
|
||||
@ -98,12 +98,17 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
||||
return (0);
|
||||
}
|
||||
}
|
||||
id = strtoul(p, (char **)NULL, 10);
|
||||
id = strtoul(p, &ep, 10);
|
||||
if (errno == ERANGE) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
warnx("%s > max uid value (%lu)", p, ULONG_MAX);
|
||||
return (0);
|
||||
}
|
||||
if (*ep != '\0' || ep == p) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
warnx("%s uid is incorrect", p);
|
||||
return (0);
|
||||
}
|
||||
if (root && id) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
warnx("root uid should be 0");
|
||||
@ -119,12 +124,17 @@ __pw_scan(char *bp, struct passwd *pw, int flags)
|
||||
goto fmt;
|
||||
if (p[0])
|
||||
pw->pw_fields |= _PWF_GID;
|
||||
id = strtoul(p, (char **)NULL, 10);
|
||||
id = strtoul(p, &ep, 10);
|
||||
if (errno == ERANGE) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
warnx("%s > max gid value (%lu)", p, ULONG_MAX);
|
||||
return (0);
|
||||
}
|
||||
if (*ep != '\0' || ep == p) {
|
||||
if (flags & _PWSCAN_WARN)
|
||||
warnx("%s gid is incorrect", p);
|
||||
return (0);
|
||||
}
|
||||
if (flags & _PWSCAN_WARN && pw_big_ids_warning && id > USHRT_MAX) {
|
||||
warnx("%s > recommended max gid value (%u)", p, USHRT_MAX);
|
||||
/* return (0); This should not be fatal! */
|
||||
|
Loading…
Reference in New Issue
Block a user