linux.git/fs/ecryptfs/crypto.c, branch v2.6.25

ecryptfs: check for existing key_tfm at mount time

2008-02-06T18:41:13+00:00

Jeff Moyer pointed out that a mount; umount loop of ecryptfs, with the same
cipher & other mount options, created a new ecryptfs_key_tfm_cache item
each time, and the cache could grow quite large this way.

Looking at this with mhalcrow, we saw that ecryptfs_parse_options()
unconditionally called ecryptfs_add_new_key_tfm(), which is what was adding
these items.

Refactor ecryptfs_get_tfm_and_mutex_for_cipher_name() to create a new
helper function, ecryptfs_tfm_exists(), which checks for the cipher on the
cached key_tfm_list, and sets a pointer to it if it exists.  This can then
be called from ecryptfs_parse_options(), and new key_tfm's can be added
only when a cached one is not found.

With list locking changes suggested by akpm.

Signed-off-by: Eric Sandeen 
Cc: Michael Halcrow 
Cc: Jeff Moyer 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: change the type of cipher_code from u16 to u8

2008-02-06T18:41:13+00:00

Only the lower byte of cipher_code is ever used, so it makes sense
for its type to be u8.

Signed-off-by: Trevor Highland 
Cc: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: Minor fixes to printk messages

2008-02-06T18:41:12+00:00

The printk statements that result when the user does not have the
proper key available could use some refining.

Signed-off-by: Mike Halcrow 
Cc: Mike Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: set inode key only once per crypto operation

2008-02-06T18:41:12+00:00

There is no need to keep re-setting the same key for any given eCryptfs inode.
This patch optimizes the use of the crypto API and helps performance a bit.

Signed-off-by: Trevor Highland 
Signed-off-by: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: track header bytes rather than extents

2008-02-06T18:41:12+00:00

Remove internal references to header extents; just keep track of header bytes
instead.  Headers can easily span multiple pages with the recent persistent
file changes.

Signed-off-by: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

fs/ecryptfs/: possible cleanups

2008-02-06T18:41:12+00:00

- make the following needlessly global code static:
  - crypto.c:ecryptfs_lower_offset_for_extent()
  - crypto.c:key_tfm_list
  - crypto.c:key_tfm_list_mutex
  - inode.c:ecryptfs_getxattr()
  - main.c:ecryptfs_init_persistent_file()

- remove the no longer used mmap.c:ecryptfs_lower_page_cache

- #if 0 the unused read_write.c:ecryptfs_read()

Signed-off-by: Adrian Bunk 
Cc: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ecryptfs: fix unlocking in error paths

2007-12-23T20:54:37+00:00

Thanks to Josef Bacik for finding these.

A couple of ecryptfs error paths don't properly unlock things they locked.

Signed-off-by: Eric Sandeen 
Cc: Josef Bacik 
Cc: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

ecryptfs: fix string overflow on long cipher names

2007-12-23T20:54:36+00:00

Passing a cipher name > 32 chars on mount results in an overflow when the
cipher name is printed, because the last character in the struct
ecryptfs_key_tfm's cipher_name string was never zeroed.

Signed-off-by: Eric Sandeen 
Acked-by: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: release mutex on hash error path

2007-11-05T23:12:33+00:00

Release the crypt_stat hash mutex on allocation error. Check for error
conditions when doing crypto hash calls.

Signed-off-by: Michael Halcrow 
Reported-by: Kazuki Ohta 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds

eCryptfs: increment extent_offset once per loop interation

2007-11-05T23:12:33+00:00

The extent_offset is getting incremented twice per loop iteration through any
given page.  It should only be getting incremented once.  This bug should only
impact hosts with >4K page sizes.

Signed-off-by: Michael Halcrow 
Signed-off-by: Andrew Morton 
Signed-off-by: Linus Torvalds