Merge lp:~colin-king/ecryptfs/gcov-coverage into lp:ecryptfs

[Colin Ian King]

I ran the current eCryptfs tests on 3.8-rc4 with kernel gcov enabled and spotted a few trivial areas where it would be useful to up the test coverage on the code. So here are a few very simple additional tests to exercise eCryptfs a little further.

=== modified file 'tests/kernel/Makefile.am'
--- tests/kernel/Makefile.am	2012-11-02 23:20:18 +0000
+++ tests/kernel/Makefile.am	2013-01-25 17:05:31 +0000
@@ -8,6 +8,7 @@
 		      file-concurrent.sh \
 		      inode-race-stat.sh \
 		      inotify.sh \
+		      link.sh \
 		      llseek.sh \
 		      lp-1009207.sh \
 		      lp-469664.sh \
@@ -23,6 +24,8 @@
 		      lp-926292.sh \
 		      lp-994247.sh \
 		      miscdev-bad-count.sh \
+		      mknod.sh \
+		      mmap-bmap.sh \
 		      mmap-close.sh \
 		      mmap-dir.sh \
 		      read-dir.sh \
@@ -42,10 +45,12 @@
 		  lp-870326/test \
 		  lp-994247/test \
 		  miscdev-bad-count/test \
+		  mmap-bmap/test \
 		  mmap-close/test \
 		  mmap-dir/test \
 		  read-dir/test \
-		  trunc-file/test
+		  trunc-file/test \
+		  xattr/test
 endif
 
 directory_concurrent_test_SOURCES = directory-concurrent/test.c
@@ -73,6 +78,8 @@
 miscdev_bad_count_test_SOURCES = miscdev-bad-count/test.c
 miscdev_bad_count_test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 
+mmap_bmap_test_SOURCES = mmap-bmap/test.c
+
 mmap_close_test_SOURCES = mmap-close/test.c
 
 mmap_dir_test_SOURCES = mmap-dir/test.c
@@ -80,3 +87,6 @@
 read_dir_test_SOURCES = read-dir/test.c
 
 trunc_file_test_SOURCES = trunc-file/test.c
+
+xattr_test_SOURCES = xattr/test.c
+

=== added file 'tests/kernel/link.sh'
--- tests/kernel/link.sh	1970-01-01 00:00:00 +0000
+++ tests/kernel/link.sh	2013-01-25 17:05:31 +0000
@@ -0,0 +1,83 @@
+#!/bin/bash
+#
+# link.sh : Simple hard link sanity check
+#
+# Author: Colin Ian King <[e-mail]>
+#
+# Copyright (C) 2013 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_dir=0
+
+. ${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
+
+# TEST
+etl_add_keys || exit
+etl_lmount || exit
+etl_mount_i || exit
+test_dir=$(etl_create_test_dir) || exit
+test_file1="${test_dir}/test1"
+test_file2="${test_dir}/test2"
+
+echo "Testing 1 2 3" > $test_file1
+
+ln $test_file1 $test_file2
+
+rc=0
+#
+#  Contents should be the same
+#
+diff $test_file1 $test_file2 > /dev/null 2>&1
+if [ $? -ne 0 ]; then
+	rc=1
+fi
+
+#
+#  Size should be the same
+#
+test_file1_size=$(stat -c%s $test_file1)
+test_file2_size=$(stat -c%s $test_file2)
+if [ $test_file1_size -ne $test_file2_size ]; then
+	rc=1
+fi
+	
+#
+#  Link count should be 2 for both
+#
+test_file1_links=$(stat -c%h $test_file1)
+test_file2_links=$(stat -c%h $test_file2)
+if [ $test_file1_links -ne 2 -a $test_file2_links -ne 2 ]; then
+	rc=1
+fi
+
+rm -f $test_file1 $test_file2
+
+etl_umount || exit
+etl_mount_i || exit
+
+exit

=== added file 'tests/kernel/mknod.sh'
--- tests/kernel/mknod.sh	1970-01-01 00:00:00 +0000
+++ tests/kernel/mknod.sh	2013-01-25 17:05:31 +0000
@@ -0,0 +1,64 @@
+#!/bin/bash
+#
+# mknod.sh : Simple mknod sanity check
+#
+# Author: Colin Ian King <[e-mail]>
+#
+# Copyright (C) 2013 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_dir=0
+
+. ${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
+
+# TEST
+etl_add_keys || exit
+etl_lmount || exit
+etl_mount_i || exit
+test_dir=$(etl_create_test_dir) || exit
+test_file="${test_dir}/full"
+
+mknod $test_file c 1 7
+#
+#  Check to see if mknod succeeded as expected
+#
+if [ $? -eq 0 ]; then
+	dev=$(stat $test_file -c%t:%T)
+	if [ $? -eq 0 ]; then
+		if [ x$dev == x1:7 ]; then
+			rc=0
+		fi
+	fi
+fi
+
+rm -f $test_file
+
+etl_umount || exit
+etl_mount_i || exit
+
+exit

=== added directory 'tests/kernel/mmap-bmap'
=== added file 'tests/kernel/mmap-bmap.sh'
--- tests/kernel/mmap-bmap.sh	1970-01-01 00:00:00 +0000
+++ tests/kernel/mmap-bmap.sh	2013-01-25 17:05:31 +0000
@@ -0,0 +1,58 @@
+#!/bin/bash
+#
+# mmap-bmap.sh : Test to see if bmap from upper is a subset of the lower
+#
+# Author: Colin Ian King <[e-mail]>
+#
+# Copyright (C) 2013 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_dir=0
+
+. ${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
+
+# TEST
+etl_add_keys || exit
+etl_lmount || exit
+etl_mount_i || exit
+test_dir=$(etl_create_test_dir) || exit
+test_file="${test_dir}/test_file"
+
+dd if=/dev/zero of=$test_file bs=1M count=1 > /dev/null 2>&1 || exit
+lower_test_file=$(etl_find_lower_path $test_file)
+if [ $? -ne 0 ] || [ -z "$lower_test_file" ]; then
+        rc=1
+        exit
+fi
+${test_script_dir}/mmap-bmap/test $lower_test_file $test_file || exit
+rc=$?
+
+etl_umount || exit
+etl_mount_i || exit
+
+exit

=== added file 'tests/kernel/mmap-bmap/test.c'
--- tests/kernel/mmap-bmap/test.c	1970-01-01 00:00:00 +0000
+++ tests/kernel/mmap-bmap/test.c	2013-01-25 17:05:31 +0000
@@ -0,0 +1,132 @@
+/*
+ * Author: Colin King <[e-mail]>
+ *
+ * Copyright (C) 2013 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <linux/fs.h>
+
+static int *get_blocks(const char *filename, int *num_blocks)
+{
+	int fd, block_size, i;
+	int *blocks;
+	struct stat statinfo;
+
+	if ((fd = open(filename, O_RDONLY)) < 0) {
+		fprintf(stderr, "Cannot open %s\n", filename);
+		return NULL;
+	}
+
+	if (ioctl(fd, FIGETBSZ, &block_size) < 0) {
+		fprintf(stderr, "Cannot get block size\n");
+		close(fd);
+		return NULL;
+	}
+
+	if (fstat(fd, &statinfo) < 0) {
+		fprintf(stderr, "Cannot stat %s\n", filename);
+		close(fd);
+		return NULL;
+	}
+
+	*num_blocks = (statinfo.st_size + block_size - 1) / block_size;
+
+	blocks = malloc(sizeof(int) * *num_blocks);
+	if (!blocks) {
+		fprintf(stderr, "Cannot allocate buffer for %d blocks\n", *num_blocks);
+		close(fd);
+		return NULL;
+	}
+
+	/*
+	 *  Collect blocks, some file systems may not support FIBMAP, so
+	 *  silently ignore errors.
+	 */
+	for (i = 0; i < *num_blocks; i++) {
+		blocks[i] = i;
+		if (ioctl(fd, FIBMAP, &blocks[i]) < 0)
+			blocks[i] = 0;
+	}
+	close(fd);
+
+	return blocks;
+}
+
+int check_blocks(
+	int *lower_blocks, int lower_num_blocks,
+	int *upper_blocks, int upper_num_blocks)
+{
+	int i, j;
+
+	/*  Upper must not have more blocks than lower */
+	if (upper_num_blocks > lower_num_blocks)
+		return EXIT_FAILURE;
+
+	/*  Upper must have blocks that are in the lower */
+	for (i = 0; i < upper_num_blocks; i++) {
+		bool found = false;
+		for (j = 0; j < lower_num_blocks; j++) {
+			if (upper_blocks[i] == lower_blocks[j]) {
+				found = true;
+				break;
+			}
+		}
+		if (!found)
+			return EXIT_FAILURE;
+	}
+	return EXIT_SUCCESS;
+}
+
+int main(int argc, char **argv) {
+
+	int *lower_blocks, *upper_blocks;
+	int lower_num_blocks, upper_num_blocks;
+	int rc = EXIT_SUCCESS;
+
+	if (argc != 3) {
+		fprintf(stderr, "Usage: %s lower-file upper-file\n", argv[0]);
+		exit(EXIT_FAILURE);
+	}
+
+	lower_blocks = get_blocks(argv[1], &lower_num_blocks);
+	if (!lower_blocks)
+		exit(EXIT_FAILURE);
+
+	upper_blocks = get_blocks(argv[2], &upper_num_blocks);
+	if (!upper_blocks) {
+		free(lower_blocks);
+		exit(EXIT_FAILURE);
+	}
+
+	rc = check_blocks(lower_blocks, lower_num_blocks,
+			  upper_blocks, upper_num_blocks);
+
+	free(upper_blocks);
+	free(lower_blocks);
+
+	exit(rc);
+}

=== modified file 'tests/kernel/tests.rc'
--- tests/kernel/tests.rc	2012-11-02 23:20:18 +0000
+++ tests/kernel/tests.rc	2013-01-25 17:05:31 +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-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"
+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"

=== added directory 'tests/kernel/xattr'
=== added file 'tests/kernel/xattr.sh'
--- tests/kernel/xattr.sh	1970-01-01 00:00:00 +0000
+++ tests/kernel/xattr.sh	2013-01-25 17:05:31 +0000
@@ -0,0 +1,56 @@
+#!/bin/bash
+#
+# xattr.sh : Simple xattr checks.
+#
+# Author: Colin Ian King <[e-mail]>
+#
+# Copyright (C) 2013 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_dir=0
+
+. ${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
+
+# TEST
+etl_add_keys || exit
+etl_lmount || exit
+etl_mount_i || exit
+test_dir=$(etl_create_test_dir) || exit
+test_file="${test_dir}/test"
+
+echo "testing 1 2 3" > $test_file
+
+${test_script_dir}/xattr/test $test_file || exit
+rc=$?
+
+rm -f $test_file1
+
+etl_umount || exit
+etl_mount_i || exit
+
+exit

=== added file 'tests/kernel/xattr/test.c'
--- tests/kernel/xattr/test.c	1970-01-01 00:00:00 +0000
+++ tests/kernel/xattr/test.c	2013-01-25 17:05:31 +0000
@@ -0,0 +1,111 @@
+/*
+ * Author: Colin King <[e-mail]>
+ *
+ * Copyright (C) 2013 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; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * 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
+ */
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <stdbool.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/xattr.h>
+
+static const char *names[]  = {
+	"user.test1",
+	"user.test2",
+	"user.test3",
+	NULL
+};
+
+static const char *values[] = {
+	"test value #1",
+	"test value #2",
+	"test value #3",
+	NULL
+};
+
+int main(int argc, char **argv)
+{
+	ssize_t len, names_len = 0;
+	int i, rc;
+	char buffer[1024];
+	char *ptr = buffer;
+
+	if (argc != 2) {
+		fprintf(stderr, "Usage: %s file\n", argv[0]);
+		exit(EXIT_FAILURE);
+	}
+
+	for (i = 0; names[i]; i++) {
+		if (setxattr(argv[1], names[i], values[i], strlen(values[i]), 0) < 0)
+			exit(EXIT_FAILURE);
+		names_len += 1 + strlen(names[i]);
+	}
+
+	/*
+	 *  Sanity check that listxattr returns correct length
+	 */
+	len = listxattr(argv[1], NULL, 0);
+	if (len != names_len)
+		exit(EXIT_FAILURE);
+
+	len = listxattr(argv[1], buffer, sizeof(buffer));
+	if (len < 0)
+		exit(EXIT_FAILURE);
+
+	/*  
+	 *  Check listxattr names match what has been just set
+	 */
+	for (i = 0; names[i]; i++) {
+		if (strcmp(names[i], ptr))
+			exit(EXIT_FAILURE);
+		ptr += strlen(ptr) + 1;
+	}
+
+	/*
+	 *  Check contents of xattr
+	 */
+	for (i = 0; names[i]; i++) {
+		len = getxattr(argv[1], names[i], buffer, sizeof(buffer));
+		if (len < 0)
+			exit(EXIT_FAILURE);
+		buffer[len] = '\0';
+
+		if (strcmp(values[i], buffer))
+			exit(EXIT_FAILURE);
+	}
+	
+	/*
+	 *  Remove xattr
+	 */
+	for (i = 0; names[i]; i++) {
+		rc = removexattr(argv[1], names[i]);
+		if (rc < 0)
+			exit(EXIT_FAILURE);
+	}
+
+	/*
+	 *  ..and there should be no xattrs left
+	 */
+	len = listxattr(argv[1], NULL, 0);
+	if (len != 0)
+		exit(EXIT_FAILURE);
+		
+	exit(EXIT_SUCCESS);
+}