From 38d84d683e0d615a0d0c3217090299ac30146bdf Mon Sep 17 00:00:00 2001 From: Conrad Meyer Date: Fri, 17 Nov 2017 19:25:39 +0000 Subject: [PATCH] vfs_lookup: Allow PATH_MAX-1 symlinks Previously, symlinks in FreeBSD were artificially limited to PATH_MAX-2. Add a short test case to verify the change. Submitted by: Gaurav Gangalwar Reviewed by: kib Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D12589 --- sys/kern/vfs_lookup.c | 2 +- tests/sys/vfs/Makefile | 2 ++ tests/sys/vfs/lookup_test.sh | 17 +++++++++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 tests/sys/vfs/lookup_test.sh diff --git a/sys/kern/vfs_lookup.c b/sys/kern/vfs_lookup.c index 09503e4ca477..c70329602226 100644 --- a/sys/kern/vfs_lookup.c +++ b/sys/kern/vfs_lookup.c @@ -499,7 +499,7 @@ namei(struct nameidata *ndp) error = ENOENT; break; } - if (linklen + ndp->ni_pathlen >= MAXPATHLEN) { + if (linklen + ndp->ni_pathlen > MAXPATHLEN) { if (ndp->ni_pathlen > 1) uma_zfree(namei_zone, cp); error = ENAMETOOLONG; diff --git a/tests/sys/vfs/Makefile b/tests/sys/vfs/Makefile index ec1e66b5042f..f4b4bdd946dd 100644 --- a/tests/sys/vfs/Makefile +++ b/tests/sys/vfs/Makefile @@ -7,6 +7,8 @@ TESTSDIR= ${TESTSBASE}/sys/vfs ATF_TESTS_C+= lookup_cap_dotdot CFLAGS.lookup_cap_dotdot.c+= -I${SRCTOP}/tests +#ATF_TESTS_SH+= lookup_test + TAP_TESTS_SH+= trailing_slash .include diff --git a/tests/sys/vfs/lookup_test.sh b/tests/sys/vfs/lookup_test.sh new file mode 100644 index 000000000000..909afddda8d6 --- /dev/null +++ b/tests/sys/vfs/lookup_test.sh @@ -0,0 +1,17 @@ +# $FreeBSD$ + +long_symlink_head() +{ + atf_set "descr" "Test for 1023 (PATH_MAX-1) symlink support" +} +long_symlink_body() +{ + atf_check -s exit:0 ln -s aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa sym_long + # was: "stat: sym_long: stat: File name too long"; exit 1 + atf_check -s exit:0 -o ignore stat -L sym_long +} + +atf_init_test_cases() +{ + atf_add_test_case long_symlink +}