sync to Linus v4.13-rc2 for subsystem developers to work against

24 files changed, 365 insertions, 334 deletions

diff --git a/security/Kconfig b/security/Kconfig
index d540bfe73190..e8e449444e65 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -163,6 +163,13 @@ config HARDENED_USERCOPY_PAGESPAN
           been removed. This config is intended to be used only while
           trying to find such users.
 
+config FORTIFY_SOURCE
+        bool "Harden common str/mem functions against buffer overflows"
+        depends on ARCH_HAS_FORTIFY_SOURCE
+        help
+          Detect overflows of buffers in common string and memory functions
+          where the compiler can determine and validate the buffer sizes.
+
 config STATIC_USERMODEHELPER
         bool "Force all usermode helper calls through a single binary"
         help
diff --git a/security/apparmor/match.c b/security/apparmor/match.c
index 960c913381e2..72c604350e80 100644
--- a/security/apparmor/match.c
+++ b/security/apparmor/match.c
@@ -226,7 +226,7 @@ void aa_dfa_free_kref(struct kref *kref)
  * @flags: flags controlling what type of accept tables are acceptable
  *
  * Unpack a dfa that has been serialized.  To find information on the dfa
- * format look in Documentation/security/apparmor.txt
+ * format look in Documentation/admin-guide/LSM/apparmor.rst
  * Assumes the dfa @blob stream has been aligned on a 8 byte boundary
  *
  * Returns: an unpacked dfa ready for matching or ERR_PTR on failure
diff --git a/security/apparmor/policy_unpack.c b/security/apparmor/policy_unpack.c
index 6e6f8c1a10a9..c600f4dd1783 100644
--- a/security/apparmor/policy_unpack.c
+++ b/security/apparmor/policy_unpack.c
@@ -13,7 +13,7 @@
  * License.
  *
  * AppArmor uses a serialized binary format for loading policy. To find
- * policy format documentation look in Documentation/security/apparmor.txt
+ * policy format documentation see Documentation/admin-guide/LSM/apparmor.rst
  * All policy is validated before it is used.
  */
 
diff --git a/security/integrity/evm/evm_crypto.c b/security/integrity/evm/evm_crypto.c
index d7f282d75cc1..1d32cd20009a 100644
--- a/security/integrity/evm/evm_crypto.c
+++ b/security/integrity/evm/evm_crypto.c
@@ -164,7 +164,7 @@ static void hmac_add_misc(struct shash_desc *desc, struct inode *inode,
         hmac_misc.mode = inode->i_mode;
         crypto_shash_update(desc, (const u8 *)&hmac_misc, sizeof(hmac_misc));
         if (evm_hmac_attrs & EVM_ATTR_FSUUID)
-                crypto_shash_update(desc, inode->i_sb->s_uuid,
+                crypto_shash_update(desc, &inode->i_sb->s_uuid.b[0],
                                     sizeof(inode->i_sb->s_uuid));
         crypto_shash_final(desc, digest);
 }
diff --git a/security/integrity/ima/ima_policy.c b/security/integrity/ima/ima_policy.c
index f4436626ccb7..95209a5f8595 100644
--- a/security/integrity/ima/ima_policy.c
+++ b/security/integrity/ima/ima_policy.c
@@ -61,7 +61,7 @@ struct ima_rule_entry {
         enum ima_hooks func;
         int mask;
         unsigned long fsmagic;
-        u8 fsuuid[16];
+        uuid_t fsuuid;
         kuid_t uid;
         kuid_t fowner;
         bool (*uid_op)(kuid_t, kuid_t);    /* Handlers for operators       */
@@ -266,7 +266,7 @@ static bool ima_match_rules(struct ima_rule_entry *rule, struct inode *inode,
             && rule->fsmagic != inode->i_sb->s_magic)
                 return false;
         if ((rule->flags & IMA_FSUUID) &&
-            memcmp(rule->fsuuid, inode->i_sb->s_uuid, sizeof(rule->fsuuid)))
+            !uuid_equal(&rule->fsuuid, &inode->i_sb->s_uuid))
                 return false;
         if ((rule->flags & IMA_UID) && !rule->uid_op(cred->uid, rule->uid))
                 return false;
@@ -743,14 +743,12 @@ static int ima_parse_rule(char *rule, struct ima_rule_entry *entry)
                 case Opt_fsuuid:
                         ima_log_string(ab, "fsuuid", args[0].from);
 
-                        if (memchr_inv(entry->fsuuid, 0x00,
-                                       sizeof(entry->fsuuid))) {
+                        if (uuid_is_null(&entry->fsuuid)) {
                                 result = -EINVAL;
                                 break;
                         }
 
-                        result = blk_part_pack_uuid(args[0].from,
-                                                    entry->fsuuid);
+                        result = uuid_parse(args[0].from, &entry->fsuuid);
                         if (!result)
                                 entry->flags |= IMA_FSUUID;
                         break;
@@ -1073,7 +1071,7 @@ int ima_policy_show(struct seq_file *m, void *v)
         }
 
         if (entry->flags & IMA_FSUUID) {
-                seq_printf(m, "fsuuid=%pU", entry->fsuuid);
+                seq_printf(m, "fsuuid=%pU", &entry->fsuuid);
                 seq_puts(m, " ");
         }
 
diff --git a/security/keys/Kconfig b/security/keys/Kconfig
index 6fd95f76bfae..a7a23b5541f8 100644
--- a/security/keys/Kconfig
+++ b/security/keys/Kconfig
@@ -20,6 +20,10 @@ config KEYS
 
           If you are unsure as to whether this is required, answer N.
 
+config KEYS_COMPAT
+        def_bool y
+        depends on COMPAT && KEYS
+
 config PERSISTENT_KEYRINGS
         bool "Enable register of persistent per-UID keyrings"
         depends on KEYS
@@ -89,9 +93,9 @@ config ENCRYPTED_KEYS
 config KEY_DH_OPERATIONS
        bool "Diffie-Hellman operations on retained keys"
        depends on KEYS
-       select MPILIB
        select CRYPTO
        select CRYPTO_HASH
+       select CRYPTO_DH
        help
          This option provides support for calculating Diffie-Hellman
          public keys and shared secrets using values stored as keys
diff --git a/security/keys/compat_dh.c b/security/keys/compat_dh.c
index a6a659b6bcb6..aa6b34cafe5f 100644
--- a/security/keys/compat_dh.c
+++ b/security/keys/compat_dh.c
@@ -33,6 +33,8 @@ long compat_keyctl_dh_compute(struct keyctl_dh_params __user *params,
         kdfcopy.hashname = compat_ptr(compat_kdfcopy.hashname);
         kdfcopy.otherinfo = compat_ptr(compat_kdfcopy.otherinfo);
         kdfcopy.otherinfolen = compat_kdfcopy.otherinfolen;
+        memcpy(kdfcopy.__spare, compat_kdfcopy.__spare,
+               sizeof(kdfcopy.__spare));
 
         return __keyctl_dh_compute(params, buffer, buflen, &kdfcopy);
 }
diff --git a/security/keys/dh.c b/security/keys/dh.c
index e603bd912e4c..d1ea9f325f94 100644
--- a/security/keys/dh.c
+++ b/