Merge lp:~tyhicks/ecryptfs/namelen-test into lp:ecryptfs

[Tyler Hicks]

[Colin Ian King (colin-king)]

Looks sane to me. Ack.

review: Approve

[lp:~tyhicks/ecryptfs/namelen-test]

835. By Tyler Hicks on 2014-11-26

Add test for validating reported namelen value

[Tyler Hicks (tyhicks)]

Hey Colin - I fixed and pushed a small issue right before you gave me the ack. I didn't call the proper cleanup helpers (etl_umount, etl_lumount, etl_unlink_keys) from the test script's cleanup trap.

=== modified file 'tests/kernel/Makefile.am'
--- tests/kernel/Makefile.am	2013-01-24 17:33:42 +0000
+++ tests/kernel/Makefile.am	2014-11-26 18:42:15 +0000
@@ -28,6 +28,7 @@
 		      mmap-bmap.sh \
 		      mmap-close.sh \
 		      mmap-dir.sh \
+		      namelen.sh \
 		      read-dir.sh \
 		      setattr-flush-dirty.sh \
 		      trunc-file.sh

=== added file 'tests/kernel/namelen.sh'
--- tests/kernel/namelen.sh	1970-01-01 00:00:00 +0000
+++ tests/kernel/namelen.sh	2014-11-26 18:42:15 +0000
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# namelen.sh: Test for validating namelen reported by eCryptfs
+# Author: Tyler Hicks <[e-mail]>
+#
+# Copyright (C) 2014 Canonical Ltd.
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation version 2
+# of the License.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+
+test_script_dir=$(dirname $0)
+rc=1
+
+. ${test_script_dir}/../lib/etl_funcs.sh
+
+test_cleanup()
+{
+	etl_remove_test_dir "$test_dir"
+	etl_umount
+	etl_lumount
+	etl_unlink_keys
+	exit $rc
+}
+trap test_cleanup 0 1 2 3 15
+
+etl_add_keys || exit
+etl_lmount || exit
+etl_mount_i || exit
+test_dir=$(etl_create_test_dir) || exit
+test_file="$test_dir/a"
+
+namelen=$(getconf NAME_MAX "$test_dir")
+[ $namelen -le 0 ] && exit
+
+# Make sure we can create any file up to namelen chars long
+for ((i=1; i <= $namelen; i++)); do
+	touch "$test_file" || exit
+	rm $test_file
+	test_file+=a
+done
+
+# Throw an error if creating a file (namelen + 1) chars long succeeds
+test_file+=a
+touch "$test_file" 2>/dev/null && exit
+
+rc=0
+exit

=== modified file 'tests/kernel/tests.rc'
--- tests/kernel/tests.rc	2013-01-24 17:33:42 +0000
+++ tests/kernel/tests.rc	2014-11-26 18:42:15 +0000
@@ -1,2 +1,2 @@
 destructive="miscdev-bad-count.sh extend-file-random.sh trunc-file.sh directory-concurrent.sh file-concurrent.sh lp-994247.sh"
-safe="llseek.sh lp-469664.sh lp-524919.sh lp-509180.sh lp-613873.sh lp-745836.sh lp-870326.sh lp-885744.sh lp-926292.sh inotify.sh mmap-bmap.sh mmap-close.sh mmap-dir.sh read-dir.sh setattr-flush-dirty.sh inode-race-stat.sh lp-1009207.sh enospc.sh lp-911507.sh lp-872905.sh lp-561129.sh mknod.sh link.sh xattr.sh"
+safe="llseek.sh lp-469664.sh lp-524919.sh lp-509180.sh lp-613873.sh lp-745836.sh lp-870326.sh lp-885744.sh lp-926292.sh inotify.sh mmap-bmap.sh mmap-close.sh mmap-dir.sh read-dir.sh setattr-flush-dirty.sh inode-race-stat.sh lp-1009207.sh enospc.sh lp-911507.sh lp-872905.sh lp-561129.sh mknod.sh link.sh xattr.sh namelen.sh"