Commit 4047df09 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ecryptfs/ecryptfs-2.6:
  ima: ecryptfs fix imbalance message
  eCryptfs: Remove Kconfig NET dependency and select MD5
  ecryptfs: depends on CRYPTO
parents a372bf8b 36520be8

fs/ecryptfs/Kconfig

+2 −1
Original line number Diff line number Diff line 
config ECRYPT_FS

	tristate "eCrypt filesystem layer support (EXPERIMENTAL)"

	depends on EXPERIMENTAL && KEYS && NET

	depends on EXPERIMENTAL && KEYS && CRYPTO

	select CRYPTO_ECB

	select CRYPTO_CBC

	select CRYPTO_MD5

	help

	  Encrypted filesystem that operates on the VFS layer.  See

	  <file:Documentation/filesystems/ecryptfs.txt> to learn more about

fs/ecryptfs/main.c

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include <linux/key.h>

#include <linux/parser.h>

#include <linux/fs_stack.h>

#include <linux/ima.h>

#include "ecryptfs_kernel.h"



/**
@@ -118,6 +119,7 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) 
	const struct cred *cred = current_cred();

	struct ecryptfs_inode_info *inode_info =

		ecryptfs_inode_to_private(ecryptfs_dentry->d_inode);

	int opened_lower_file = 0;

	int rc = 0;



	mutex_lock(&inode_info->lower_file_mutex);
@@ -134,9 +136,12 @@ int ecryptfs_init_persistent_file(struct dentry *ecryptfs_dentry) 
			       "for lower_dentry [0x%p] and lower_mnt [0x%p]; "

			       "rc = [%d]\n", lower_dentry, lower_mnt, rc);

			inode_info->lower_file = NULL;

		}

		} else

			opened_lower_file = 1;

	}

	mutex_unlock(&inode_info->lower_file_mutex);

	if (opened_lower_file)

		ima_counts_get(inode_info->lower_file);

	return rc;

}