From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 11 Jul 2019 17:10:01 +0000 (+0200)
Subject: 4.9-stable patches
X-Git-Tag: v5.2.1~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=89e129991f6b0483099f1423213e199d2949bf04;p=thirdparty%2Fkernel%2Fstable-queue.git

4.9-stable patches

added patches:
	fscrypt-don-t-set-policy-for-a-dead-directory.patch
---

diff --git a/queue-4.9/fscrypt-don-t-set-policy-for-a-dead-directory.patch b/queue-4.9/fscrypt-don-t-set-policy-for-a-dead-directory.patch
new file mode 100644
index 00000000000..8dc43896f41
--- /dev/null
+++ b/queue-4.9/fscrypt-don-t-set-policy-for-a-dead-directory.patch
@@ -0,0 +1,40 @@
+From 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f Mon Sep 17 00:00:00 2001
+From: Hongjie Fang <hongjiefang@asrmicro.com>
+Date: Wed, 22 May 2019 10:02:53 +0800
+Subject: fscrypt: don't set policy for a dead directory
+
+From: Hongjie Fang <hongjiefang@asrmicro.com>
+
+commit 5858bdad4d0d0fc18bf29f34c3ac836e0b59441f upstream.
+
+The directory may have been removed when entering
+fscrypt_ioctl_set_policy().  If so, the empty_dir() check will return
+error for ext4 file system.
+
+ext4_rmdir() sets i_size = 0, then ext4_empty_dir() reports an error
+because 'inode->i_size < EXT4_DIR_REC_LEN(1) + EXT4_DIR_REC_LEN(2)'.  If
+the fs is mounted with errors=panic, it will trigger a panic issue.
+
+Add the check IS_DEADDIR() to fix this problem.
+
+Fixes: 9bd8212f981e ("ext4 crypto: add encryption policy and password salt support")
+Cc: <stable@vger.kernel.org> # v4.1+
+Signed-off-by: Hongjie Fang <hongjiefang@asrmicro.com>
+Signed-off-by: Eric Biggers <ebiggers@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ fs/crypto/policy.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/fs/crypto/policy.c
++++ b/fs/crypto/policy.c
+@@ -114,6 +114,8 @@ int fscrypt_process_policy(struct file *
+ 	if (!inode_has_encryption_context(inode)) {
+ 		if (!S_ISDIR(inode->i_mode))
+ 			ret = -ENOTDIR;
++		else if (IS_DEADDIR(inode))
++			ret = -ENOENT;
+ 		else if (!inode->i_sb->s_cop->empty_dir)
+ 			ret = -EOPNOTSUPP;
+ 		else if (!inode->i_sb->s_cop->empty_dir(inode))
diff --git a/queue-4.9/series b/queue-4.9/series
index 9a874136444..3ff8326bc72 100644
--- a/queue-4.9/series
+++ b/queue-4.9/series
@@ -24,3 +24,4 @@ x86-ptrace-fix-possible-spectre-v1-in-ptrace_get_debugreg.patch
 x86-tls-fix-possible-spectre-v1-in-do_get_thread_area.patch
 mwifiex-abort-at-too-short-bss-descriptor-element.patch
 mwifiex-fix-heap-overflow-in-mwifiex_uap_parse_tail_ies.patch
+fscrypt-don-t-set-policy-for-a-dead-directory.patch