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

Check uid/gid used when creating a user/group are not larger than UID_MAX/GID_MAX

Browse Source 
PR:		173977
Reported by:	nvass@gmx.com
This commit is contained in:
Baptiste Daroussin 2015-07-28 21:10:58 +00:00
parent 81e2ba845c
commit 90a4edb584
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=285985
4 changed files with 26 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
usr.sbin/pw/pw.c
View File

@ -269,7 +269,7 @@ main(int argc, char *argv[])
}
if (strspn(optarg, "0123456789") != strlen(optarg))
errx(EX_USAGE, "-g expects a number");
id = strtonum(optarg, 0, LONG_MAX, &errstr);
id = strtonum(optarg, 0, GID_MAX, &errstr);
if (errstr != NULL)
errx(EX_USAGE, "Bad id '%s': %s", optarg,
errstr);
@ -281,7 +281,7 @@ main(int argc, char *argv[])
addarg(&arglist, 'u', optarg);
break;
}
id = strtonum(optarg, 0, LONG_MAX, &errstr);
id = strtonum(optarg, 0, UID_MAX, &errstr);
if (errstr != NULL)
errx(EX_USAGE, "Bad id '%s': %s", optarg,
errstr);

1
usr.sbin/pw/tests/Makefile
View File

@ -8,6 +8,7 @@ TESTSDIR= ${TESTSBASE}/usr.sbin/pw
ATF_TESTS_SH= pw_etcdir \
pw_lock \
pw_config \
pw_groupadd \
pw_groupdel \
pw_groupmod \
pw_useradd \

15
usr.sbin/pw/tests/pw_groupadd.sh Executable file
View File

@ -0,0 +1,15 @@
# $FreeBSD$
# Import helper functions
. $(atf_get_srcdir)/helper_functions.shin
atf_test_case group_add_gid_too_large
group_add_gid_too_large_body() {
populate_etc_skel
atf_check -s exit:64 -e inline:"pw: Bad id '9999999999999': too large\n" \
${PW} groupadd -n test1 -g 9999999999999
}
atf_init_test_cases() {
atf_add_test_case group_add_gid_too_large
}

8
usr.sbin/pw/tests/pw_useradd.sh
View File

@ -289,6 +289,13 @@ user_add_uid0_body() {
-s exit:0 ${PW} usershow foo
}
atf_test_case user_add_uid_too_large
user_add_uid_too_large_body() {
populate_etc_skel
atf_check -s exit:64 -e inline:"pw: Bad id '9999999999999': too large\n" \
${PW} useradd -n test1 -u 9999999999999
}
atf_init_test_cases() {
atf_add_test_case user_add
atf_add_test_case user_add_noupdate
@ -313,4 +320,5 @@ atf_init_test_cases() {
atf_add_test_case user_add_R
atf_add_test_case user_add_skel
atf_add_test_case user_add_uid0
atf_add_test_case user_add_uid_too_large
}