4.7 fixup for fscrypto patch and email fix for cdc-acm patch

diff --git a/queue-4.7/cdc-acm-added-sanity-checking-for-probe.patch b/queue-4.7/cdc-acm-added-sanity-checking-for-probe.patch
index 3c78cecdf90d78e3dc4eb0fec329b862af0e4541..09f6314d6f715ddd7a0a2b733ae647796d65201e 100644 (file)
--- a/queue-4.7/cdc-acm-added-sanity-checking-for-probe.patch
+++ b/queue-4.7/cdc-acm-added-sanity-checking-for-probe.patch
@@ -2,7 +2,7 @@ From oneukum@suse.com  Fri Sep  9 16:15:08 2016
 From: Oliver Neukum <oneukum@suse.com>
 Date: Thu,  8 Sep 2016 11:27:30 +0200
 Subject: cdc-acm: added sanity checking for probe()
-To: stable@vger.kernel.org, jslaby@suse.com
+To: <jslaby@suse.com>
 Cc: Oliver Neukum <oneukum@suse.com>
 Message-ID: <1473326850-5056-1-git-send-email-oneukum@suse.com>
 

diff --git a/queue-4.7/fscrypto-add-authorization-check-for-setting-encryption-policy.patch b/queue-4.7/fscrypto-add-authorization-check-for-setting-encryption-policy.patch
index 1b94a10f3b54eb9c0524294e996c447f346eca3c..4c1fa30432b263e53e30911318f9f1dd6e592c68 100644 (file)
--- a/queue-4.7/fscrypto-add-authorization-check-for-setting-encryption-policy.patch
+++ b/queue-4.7/fscrypto-add-authorization-check-for-setting-encryption-policy.patch
@@ -26,8 +26,9 @@ Signed-off-by: Theodore Ts'o <tytso@mit.edu>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 
 ---
- fs/crypto/policy.c |    3 +++
- 1 file changed, 3 insertions(+)
+ fs/crypto/policy.c      |    3 +++
+ fs/ext4/crypto_policy.c |    3 +++
+ 2 files changed, 6 insertions(+)
 
 --- a/fs/crypto/policy.c
 +++ b/fs/crypto/policy.c
@@ -41,3 +42,15 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
        if (policy->version != 0)
                return -EINVAL;
  
+--- a/fs/ext4/crypto_policy.c
++++ b/fs/ext4/crypto_policy.c
+@@ -102,6 +102,9 @@ static int ext4_create_encryption_contex
+ int ext4_process_policy(const struct ext4_encryption_policy *policy,
+                       struct inode *inode)
+ {
++      if (!inode_owner_or_capable(inode))
++              return -EACCES;
++
+       if (policy->version != 0)
+               return -EINVAL;
+