husy394 / rpms / kernel

Forked from rpms/kernel 3 years ago
Clone
Blob Blame History Raw
https://bugs.centos.org/view.php?id=7369
http://kozlex.blogspot.com/2015/05/building-ecryptfs-on-redhat-7_19.html

To fix ecryptfs and build it in the kernel follow is the partial fix:
This is a fix that will not be proposed to upstream cause it is not 
compatible with other kernels; instead it is a patch to make ecryptfs 
work on Rhel7 only.

--- a/fs/ecryptfs/main.c	2015-03-06 13:45:38.000000000 -0800
+++ b/fs/ecryptfs/main.c	2015-07-02 14:46:37.000000000 -0700
@@ -500,6 +500,7 @@ static struct dentry *ecryptfs_mount(str
 	struct path path;
 	uid_t check_ruid;
 	int rc;
+	int *s_stack_depth;
 
 	sbi = kmem_cache_zalloc(ecryptfs_sb_info_cache, GFP_KERNEL);
 	if (!sbi) {
@@ -567,10 +568,10 @@ static struct dentry *ecryptfs_mount(str
 	s->s_maxbytes = path.dentry->d_sb->s_maxbytes;
 	s->s_blocksize = path.dentry->d_sb->s_blocksize;
 	s->s_magic = ECRYPTFS_SUPER_MAGIC;
-	s->s_stack_depth = path.dentry->d_sb->s_stack_depth + 1;
+	s_stack_depth = get_s_stack_depth(path.dentry->d_sb);
 
 	rc = -EINVAL;
-	if (s->s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
+	if ( *s_stack_depth > FILESYSTEM_MAX_STACK_DEPTH) {
 		pr_err("eCryptfs: maximum fs stacking depth exceeded\n");
 		goto out_free;
 	}