diff options
| author | bapt <bapt@FreeBSD.org> | 2016-07-24 08:12:23 +0000 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2016-07-24 08:12:23 +0000 |
| commit | 67d5cea0a3d92e93dee25ae5dddf51977b9b0b70 (patch) | |
| tree | 41bf4d555fdc9bcb3903633267848cc0ff2e95b6 /usr.sbin | |
| parent | d67d2c2ff3f8f6805895c421d2e0ca1bc0921ca0 (diff) | |
| download | FreeBSD-src-67d5cea0a3d92e93dee25ae5dddf51977b9b0b70.zip FreeBSD-src-67d5cea0a3d92e93dee25ae5dddf51977b9b0b70.tar.gz | |
iDo not try to delete the home of the user if is is not a directory for example
"/dev/null"
PR: 211195
Submitted by: rday <ryan@ryanday.net>
Reported by: eniorm <eniorm@gmail.com>
Approved by: re (kib)
Diffstat (limited to 'usr.sbin')
| -rw-r--r-- | usr.sbin/pw/rm_r.c | 3 | ||||
| -rwxr-xr-x | usr.sbin/pw/tests/pw_userdel.sh | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/usr.sbin/pw/rm_r.c b/usr.sbin/pw/rm_r.c index 172c7b0..45fc5d1 100644 --- a/usr.sbin/pw/rm_r.c +++ b/usr.sbin/pw/rm_r.c @@ -50,6 +50,9 @@ rm_r(int rootfd, const char *path, uid_t uid) path++; dirfd = openat(rootfd, path, O_DIRECTORY); + if (dirfd == -1) { + return; + } d = fdopendir(dirfd); while ((e = readdir(d)) != NULL) { diff --git a/usr.sbin/pw/tests/pw_userdel.sh b/usr.sbin/pw/tests/pw_userdel.sh index f608029..d03501a 100755 --- a/usr.sbin/pw/tests/pw_userdel.sh +++ b/usr.sbin/pw/tests/pw_userdel.sh @@ -59,9 +59,18 @@ delete_numeric_name_body() { ${PW} userdel -n 4001 } +atf_test_case home_not_a_dir +home_not_a_dir_body() { + populate_root_etc_skel + touch ${HOME}/foo + atf_check ${RPW} useradd foo -d /foo + atf_check ${RPW} userdel foo -r +} + atf_init_test_cases() { atf_add_test_case rmuser_seperate_group atf_add_test_case user_do_not_try_to_delete_root_if_user_unknown atf_add_test_case delete_files atf_add_test_case delete_numeric_name + atf_add_test_case home_not_a_dir } |
