~ubuntu-branches/ubuntu/trusty/ecryptfs-utils/trusty-security

« back to all changes in this revision

Viewing changes to tests/kernel/Makefile.in

  • Committer: Package Import Robot
  • Author(s): Dustin Kirkland, Eric Lammerts, Tyler Hicks, Colin King, Dustin Kirkland
  • Date: 2012-10-25 16:13:28 UTC
  • mfrom: (1.1.46) (43.1.1 raring-proposed)
  • Revision ID: package-import@ubuntu.com-20121025161328-wb9k7d5h8xiur2hv
[ Eric Lammerts ]
* src/libecryptfs/sysfs.c: LP: #1007880
  - Handle NULL mnt pointer when sysfs is not mounted

[ Tyler Hicks ]
* src/utils/ecryptfs-migrate-home: LP: #1026180
  - Correct minor misspelling
* src/utils/ecryptfs-recover-private: LP: #1004082
  - Fix option parsing when --rw is specified
* src/utils/ecryptfs-recover-private: LP: #1028923
  - Simplify success message to prevent incorrectly reporting that a
    read-only mount was performed when the --rw option is specified
* tests/lib/etl_func.sh:
  - Add test library function to return a lower path from an upper path,
    based on inode numbers
* tests/kernel/mmap-close.sh, tests/kernel/mmap-close/test.c:
  - Add regression test for open->mmap()->close()->dirty memory->munmap()
    pattern
* tests/kernel/lp-561129.sh:
  - Add test for checking that a pre-existing target inode is properly
    evicted after a rename
* tests/README:
  - Add documentation on the steps to take when adding new test cases

[ Colin King ]
* tests/kernel/lp-911507.sh:
  - Add test case for initializing empty lower files during open()
* tests/kernel/lp-872905.sh:
  - Add test case to check for proper unlinking of lower files when
    lower file initialization fails
* src/key_mod/ecryptfs_key_mod_openssl.c,
  src/key_mod/ecryptfs_key_mod_pkcs11_helper.c,
  src/libecryptfs/key_management.c,
  src/utils/mount.ecryptfs_private.c, src/utils/umount.ecryptfs.c:
  - address some issues raised by smatch static analysis
  - fix some memory leaks with frees
  - fix some pointer refs and derefs
  - fix some comment typos

[ Dustin Kirkland ]
* src/libecryptfs/key_management.c:
  - silence pam error message when errno == EACCES
    + "Error attempting to parse .ecryptfsrc file; rc = [-13]"
* src/utils/mount.ecryptfs_private.c: LP: #1052038
  - fix race condition, which typically manifests itself with a user
    saying that their home directory is not accessible, or that their
    filenames are not decrypted
  - the root of the problem is that we were reading the signature file,
    ~/.ecryptfs/Private.sig, twice; in some cases, the first one succeeds,
    so the file encryption signature is read and key is loaded, but then
    some other process (usually from PAM, perhaps a cron job or a
    subsequent login) mounts the home directory before the filename
    encryption key is loaded;  thus, $HOME is mounted but filenames are
    not decrypted, so the second read of ~/.ecryptfs/Private.sig fails
    as that file is not found
  - the solution is to rework the internal fetch_sig() function and read
    one or both signatures within a single open/read/close operation of
    the file
  - free memory used by char **sig on failure
* debian/copyright:
  - fix lintian warning
* precise

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Makefile.in generated by automake 1.11.3 from Makefile.am.
 
1
# Makefile.in generated by automake 1.11.6 from Makefile.am.
2
2
# @configure_input@
3
3
 
4
4
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
18
18
 
19
19
 
20
20
VPATH = @srcdir@
 
21
am__make_dryrun = \
 
22
  { \
 
23
    am__dry=no; \
 
24
    case $$MAKEFLAGS in \
 
25
      *\\[\ \   ]*) \
 
26
        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
 
27
          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
 
28
      *) \
 
29
        for am__flg in $$MAKEFLAGS; do \
 
30
          case $$am__flg in \
 
31
            *=*|--*) ;; \
 
32
            *n*) am__dry=yes; break;; \
 
33
          esac; \
 
34
        done;; \
 
35
    esac; \
 
36
    test $$am__dry = yes; \
 
37
  }
21
38
pkgdatadir = $(datadir)/@PACKAGE@
22
39
pkgincludedir = $(includedir)/@PACKAGE@
23
40
pkglibdir = $(libdir)/@PACKAGE@
37
54
build_triplet = @build@
38
55
host_triplet = @host@
39
56
target_triplet = @target@
40
 
@ENABLE_TESTS_TRUE@noinst_PROGRAMS = miscdev-bad-count/test$(EXEEXT) \
 
57
@ENABLE_TESTS_TRUE@noinst_PROGRAMS =  \
 
58
@ENABLE_TESTS_TRUE@     directory-concurrent/test$(EXEEXT) \
 
59
@ENABLE_TESTS_TRUE@     enospc/test$(EXEEXT) \
41
60
@ENABLE_TESTS_TRUE@     extend-file-random/test$(EXEEXT) \
42
 
@ENABLE_TESTS_TRUE@     trunc-file/test$(EXEEXT) \
43
 
@ENABLE_TESTS_TRUE@     directory-concurrent/test$(EXEEXT) \
44
61
@ENABLE_TESTS_TRUE@     file-concurrent/test$(EXEEXT) \
 
62
@ENABLE_TESTS_TRUE@     inode-race-stat/test$(EXEEXT) \
45
63
@ENABLE_TESTS_TRUE@     inotify/test$(EXEEXT) \
46
 
@ENABLE_TESTS_TRUE@     mmap-dir/test$(EXEEXT) \
47
 
@ENABLE_TESTS_TRUE@     read-dir/test$(EXEEXT) \
48
 
@ENABLE_TESTS_TRUE@     inode-race-stat/test$(EXEEXT) \
49
64
@ENABLE_TESTS_TRUE@     lp-509180/test$(EXEEXT) \
50
65
@ENABLE_TESTS_TRUE@     lp-524919/test$(EXEEXT) \
51
66
@ENABLE_TESTS_TRUE@     lp-870326/test$(EXEEXT) \
52
67
@ENABLE_TESTS_TRUE@     lp-994247/test$(EXEEXT) \
53
 
@ENABLE_TESTS_TRUE@     enospc/test$(EXEEXT)
 
68
@ENABLE_TESTS_TRUE@     miscdev-bad-count/test$(EXEEXT) \
 
69
@ENABLE_TESTS_TRUE@     mmap-close/test$(EXEEXT) \
 
70
@ENABLE_TESTS_TRUE@     mmap-dir/test$(EXEEXT) \
 
71
@ENABLE_TESTS_TRUE@     read-dir/test$(EXEEXT) \
 
72
@ENABLE_TESTS_TRUE@     trunc-file/test$(EXEEXT)
54
73
subdir = tests/kernel
55
74
DIST_COMMON = $(dist_noinst_DATA) $(dist_noinst_SCRIPTS) \
56
75
        $(srcdir)/Makefile.am $(srcdir)/Makefile.in
107
126
miscdev_bad_count_test_OBJECTS = $(am_miscdev_bad_count_test_OBJECTS)
108
127
miscdev_bad_count_test_DEPENDENCIES =  \
109
128
        $(top_builddir)/src/libecryptfs/libecryptfs.la
 
129
am_mmap_close_test_OBJECTS = mmap-close/test.$(OBJEXT)
 
130
mmap_close_test_OBJECTS = $(am_mmap_close_test_OBJECTS)
 
131
mmap_close_test_LDADD = $(LDADD)
110
132
am_mmap_dir_test_OBJECTS = mmap-dir/test.$(OBJEXT)
111
133
mmap_dir_test_OBJECTS = $(am_mmap_dir_test_OBJECTS)
112
134
mmap_dir_test_LDADD = $(LDADD)
136
158
        $(inode_race_stat_test_SOURCES) $(inotify_test_SOURCES) \
137
159
        $(lp_509180_test_SOURCES) $(lp_524919_test_SOURCES) \
138
160
        $(lp_870326_test_SOURCES) $(lp_994247_test_SOURCES) \
139
 
        $(miscdev_bad_count_test_SOURCES) $(mmap_dir_test_SOURCES) \
140
 
        $(read_dir_test_SOURCES) $(trunc_file_test_SOURCES)
 
161
        $(miscdev_bad_count_test_SOURCES) $(mmap_close_test_SOURCES) \
 
162
        $(mmap_dir_test_SOURCES) $(read_dir_test_SOURCES) \
 
163
        $(trunc_file_test_SOURCES)
141
164
DIST_SOURCES = $(directory_concurrent_test_SOURCES) \
142
165
        $(enospc_test_SOURCES) $(extend_file_random_test_SOURCES) \
143
166
        $(file_concurrent_test_SOURCES) \
144
167
        $(inode_race_stat_test_SOURCES) $(inotify_test_SOURCES) \
145
168
        $(lp_509180_test_SOURCES) $(lp_524919_test_SOURCES) \
146
169
        $(lp_870326_test_SOURCES) $(lp_994247_test_SOURCES) \
147
 
        $(miscdev_bad_count_test_SOURCES) $(mmap_dir_test_SOURCES) \
148
 
        $(read_dir_test_SOURCES) $(trunc_file_test_SOURCES)
 
170
        $(miscdev_bad_count_test_SOURCES) $(mmap_close_test_SOURCES) \
 
171
        $(mmap_dir_test_SOURCES) $(read_dir_test_SOURCES) \
 
172
        $(trunc_file_test_SOURCES)
 
173
am__can_run_installinfo = \
 
174
  case $$AM_UPDATE_INFO_DIR in \
 
175
    n|no|NO) false;; \
 
176
    *) (install-info --version) >/dev/null 2>&1;; \
 
177
  esac
149
178
DATA = $(dist_noinst_DATA)
150
179
ETAGS = etags
151
180
CTAGS = ctags
353
382
top_srcdir = @top_srcdir@
354
383
AUTOMAKE_OPTIONS = subdir-objects
355
384
dist_noinst_DATA = tests.rc
356
 
dist_noinst_SCRIPTS = lp-885744.sh \
357
 
                      miscdev-bad-count.sh \
 
385
dist_noinst_SCRIPTS = directory-concurrent.sh \
 
386
                      enospc.sh \
358
387
                      extend-file-random.sh \
359
 
                      trunc-file.sh \
360
 
                      directory-concurrent.sh \
361
388
                      file-concurrent.sh \
362
 
                      mmap-dir.sh \
363
 
                      lp-926292.sh \
364
 
                      read-dir.sh \
365
 
                      setattr-flush-dirty.sh \
366
389
                      inode-race-stat.sh \
367
390
                      inotify.sh \
 
391
                      lp-1009207.sh \
 
392
                      lp-469664.sh \
368
393
                      lp-509180.sh \
369
394
                      lp-524919.sh \
 
395
                      lp-561129.sh \
 
396
                      lp-613873.sh \
 
397
                      lp-745836.sh \
370
398
                      lp-870326.sh \
371
 
                      lp-469664.sh \
372
 
                      lp-613873.sh \
373
 
                      lp-1009207.sh \
374
 
                      lp-994247.sh
 
399
                      lp-872905.sh \
 
400
                      lp-885744.sh \
 
401
                      lp-911507.sh \
 
402
                      lp-926292.sh \
 
403
                      lp-994247.sh \
 
404
                      miscdev-bad-count.sh \
 
405
                      mmap-close.sh \
 
406
                      mmap-dir.sh \
 
407
                      read-dir.sh \
 
408
                      setattr-flush-dirty.sh \
 
409
                      trunc-file.sh
375
410
 
376
 
miscdev_bad_count_test_SOURCES = miscdev-bad-count/test.c
377
 
miscdev_bad_count_test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 
411
directory_concurrent_test_SOURCES = directory-concurrent/test.c
 
412
enospc_test_SOURCES = enospc/test.c
378
413
extend_file_random_test_SOURCES = extend-file-random/test.c
379
 
trunc_file_test_SOURCES = trunc-file/test.c
380
 
directory_concurrent_test_SOURCES = directory-concurrent/test.c
381
414
file_concurrent_test_SOURCES = file-concurrent/test.c
 
415
inode_race_stat_test_SOURCES = inode-race-stat/test.c
382
416
inotify_test_SOURCES = inotify/test.c
383
 
mmap_dir_test_SOURCES = mmap-dir/test.c
384
 
read_dir_test_SOURCES = read-dir/test.c
385
 
inode_race_stat_test_SOURCES = inode-race-stat/test.c
386
417
lp_509180_test_SOURCES = lp-509180/test.c
387
418
lp_524919_test_SOURCES = lp-524919/test.c
388
419
lp_870326_test_SOURCES = lp-870326/test.c
389
420
lp_994247_test_SOURCES = lp-994247/test.c
390
 
enospc_test_SOURCES = enospc/test.c
 
421
miscdev_bad_count_test_SOURCES = miscdev-bad-count/test.c
 
422
miscdev_bad_count_test_LDADD = $(top_builddir)/src/libecryptfs/libecryptfs.la
 
423
mmap_close_test_SOURCES = mmap-close/test.c
 
424
mmap_dir_test_SOURCES = mmap-dir/test.c
 
425
read_dir_test_SOURCES = read-dir/test.c
 
426
trunc_file_test_SOURCES = trunc-file/test.c
391
427
all: all-am
392
428
 
393
429
.SUFFIXES:
553
589
miscdev-bad-count/test$(EXEEXT): $(miscdev_bad_count_test_OBJECTS) $(miscdev_bad_count_test_DEPENDENCIES) $(EXTRA_miscdev_bad_count_test_DEPENDENCIES) miscdev-bad-count/$(am__dirstamp)
554
590
        @rm -f miscdev-bad-count/test$(EXEEXT)
555
591
        $(LINK) $(miscdev_bad_count_test_OBJECTS) $(miscdev_bad_count_test_LDADD) $(LIBS)
 
592
mmap-close/$(am__dirstamp):
 
593
        @$(MKDIR_P) mmap-close
 
594
        @: > mmap-close/$(am__dirstamp)
 
595
mmap-close/$(DEPDIR)/$(am__dirstamp):
 
596
        @$(MKDIR_P) mmap-close/$(DEPDIR)
 
597
        @: > mmap-close/$(DEPDIR)/$(am__dirstamp)
 
598
mmap-close/test.$(OBJEXT): mmap-close/$(am__dirstamp) \
 
599
        mmap-close/$(DEPDIR)/$(am__dirstamp)
 
600
mmap-close/test$(EXEEXT): $(mmap_close_test_OBJECTS) $(mmap_close_test_DEPENDENCIES) $(EXTRA_mmap_close_test_DEPENDENCIES) mmap-close/$(am__dirstamp)
 
601
        @rm -f mmap-close/test$(EXEEXT)
 
602
        $(LINK) $(mmap_close_test_OBJECTS) $(mmap_close_test_LDADD) $(LIBS)
556
603
mmap-dir/$(am__dirstamp):
557
604
        @$(MKDIR_P) mmap-dir
558
605
        @: > mmap-dir/$(am__dirstamp)
600
647
        -rm -f lp-870326/test.$(OBJEXT)
601
648
        -rm -f lp-994247/test.$(OBJEXT)
602
649
        -rm -f miscdev-bad-count/test.$(OBJEXT)
 
650
        -rm -f mmap-close/test.$(OBJEXT)
603
651
        -rm -f mmap-dir/test.$(OBJEXT)
604
652
        -rm -f read-dir/test.$(OBJEXT)
605
653
        -rm -f trunc-file/test.$(OBJEXT)
618
666
@AMDEP_TRUE@@am__include@ @am__quote@lp-870326/$(DEPDIR)/test.Po@am__quote@
619
667
@AMDEP_TRUE@@am__include@ @am__quote@lp-994247/$(DEPDIR)/test.Po@am__quote@
620
668
@AMDEP_TRUE@@am__include@ @am__quote@miscdev-bad-count/$(DEPDIR)/test.Po@am__quote@
 
669
@AMDEP_TRUE@@am__include@ @am__quote@mmap-close/$(DEPDIR)/test.Po@am__quote@
621
670
@AMDEP_TRUE@@am__include@ @am__quote@mmap-dir/$(DEPDIR)/test.Po@am__quote@
622
671
@AMDEP_TRUE@@am__include@ @am__quote@read-dir/$(DEPDIR)/test.Po@am__quote@
623
672
@AMDEP_TRUE@@am__include@ @am__quote@trunc-file/$(DEPDIR)/test.Po@am__quote@
662
711
        -rm -rf lp-870326/.libs lp-870326/_libs
663
712
        -rm -rf lp-994247/.libs lp-994247/_libs
664
713
        -rm -rf miscdev-bad-count/.libs miscdev-bad-count/_libs
 
714
        -rm -rf mmap-close/.libs mmap-close/_libs
665
715
        -rm -rf mmap-dir/.libs mmap-dir/_libs
666
716
        -rm -rf read-dir/.libs read-dir/_libs
667
717
        -rm -rf trunc-file/.libs trunc-file/_libs
800
850
        -rm -f lp-994247/$(am__dirstamp)
801
851
        -rm -f miscdev-bad-count/$(DEPDIR)/$(am__dirstamp)
802
852
        -rm -f miscdev-bad-count/$(am__dirstamp)
 
853
        -rm -f mmap-close/$(DEPDIR)/$(am__dirstamp)
 
854
        -rm -f mmap-close/$(am__dirstamp)
803
855
        -rm -f mmap-dir/$(DEPDIR)/$(am__dirstamp)
804
856
        -rm -f mmap-dir/$(am__dirstamp)
805
857
        -rm -f read-dir/$(DEPDIR)/$(am__dirstamp)
816
868
        mostlyclean-am
817
869
 
818
870
distclean: distclean-am
819
 
        -rm -rf directory-concurrent/$(DEPDIR) enospc/$(DEPDIR) extend-file-random/$(DEPDIR) file-concurrent/$(DEPDIR) inode-race-stat/$(DEPDIR) inotify/$(DEPDIR) lp-509180/$(DEPDIR) lp-524919/$(DEPDIR) lp-870326/$(DEPDIR) lp-994247/$(DEPDIR) miscdev-bad-count/$(DEPDIR) mmap-dir/$(DEPDIR) read-dir/$(DEPDIR) trunc-file/$(DEPDIR)
 
871
        -rm -rf directory-concurrent/$(DEPDIR) enospc/$(DEPDIR) extend-file-random/$(DEPDIR) file-concurrent/$(DEPDIR) inode-race-stat/$(DEPDIR) inotify/$(DEPDIR) lp-509180/$(DEPDIR) lp-524919/$(DEPDIR) lp-870326/$(DEPDIR) lp-994247/$(DEPDIR) miscdev-bad-count/$(DEPDIR) mmap-close/$(DEPDIR) mmap-dir/$(DEPDIR) read-dir/$(DEPDIR) trunc-file/$(DEPDIR)
820
872
        -rm -f Makefile
821
873
distclean-am: clean-am distclean-compile distclean-generic \
822
874
        distclean-tags
862
914
installcheck-am:
863
915
 
864
916
maintainer-clean: maintainer-clean-am
865
 
        -rm -rf directory-concurrent/$(DEPDIR) enospc/$(DEPDIR) extend-file-random/$(DEPDIR) file-concurrent/$(DEPDIR) inode-race-stat/$(DEPDIR) inotify/$(DEPDIR) lp-509180/$(DEPDIR) lp-524919/$(DEPDIR) lp-870326/$(DEPDIR) lp-994247/$(DEPDIR) miscdev-bad-count/$(DEPDIR) mmap-dir/$(DEPDIR) read-dir/$(DEPDIR) trunc-file/$(DEPDIR)
 
917
        -rm -rf directory-concurrent/$(DEPDIR) enospc/$(DEPDIR) extend-file-random/$(DEPDIR) file-concurrent/$(DEPDIR) inode-race-stat/$(DEPDIR) inotify/$(DEPDIR) lp-509180/$(DEPDIR) lp-524919/$(DEPDIR) lp-870326/$(DEPDIR) lp-994247/$(DEPDIR) miscdev-bad-count/$(DEPDIR) mmap-close/$(DEPDIR) mmap-dir/$(DEPDIR) read-dir/$(DEPDIR) trunc-file/$(DEPDIR)
866
918
        -rm -f Makefile
867
919
maintainer-clean-am: distclean-am maintainer-clean-generic
868
920