Merge branch 'master'; commit 'v3.2-rc2' into next

10 files changed, 14 insertions, 7 deletions

diff --git a/security/integrity/ima/Kconfig b/security/integrity/ima/Kconfig
index 19c053b82303..4f554f20dc97 100644
--- a/security/integrity/ima/Kconfig
+++ b/security/integrity/ima/Kconfig
@@ -9,7 +9,7 @@ config IMA
         select CRYPTO_HMAC
         select CRYPTO_MD5
         select CRYPTO_SHA1
-        select TCG_TPM if !S390
+        select TCG_TPM if !S390 && !UML
         select TCG_TIS if TCG_TPM
         help
           The Trusted Computing Group(TCG) runtime Integrity
diff --git a/security/keys/compat.c b/security/keys/compat.c
index 338b510e9027..4c48e13448f8 100644
--- a/security/keys/compat.c
+++ b/security/keys/compat.c
@@ -38,7 +38,7 @@ long compat_keyctl_instantiate_key_iov(
 
         ret = compat_rw_copy_check_uvector(WRITE, _payload_iov, ioc,
                                            ARRAY_SIZE(iovstack),
-                                           iovstack, &iov);
+                                           iovstack, &iov, 1);
         if (ret < 0)
                 return ret;
         if (ret == 0)
diff --git a/security/keys/encrypted-keys/encrypted.c b/security/keys/encrypted-keys/encrypted.c
index f33804c1b4c8..dcc843cb0f80 100644
--- a/security/keys/encrypted-keys/encrypted.c
+++ b/security/keys/encrypted-keys/encrypted.c
@@ -293,7 +293,7 @@ static char *datablob_format(struct encrypted_key_payload *epayload,
         /* convert the hex encoded iv, encrypted-data and HMAC to ascii */
         bufp = &ascii_buf[len];
         for (i = 0; i < (asciiblob_len - len) / 2; i++)
-                bufp = pack_hex_byte(bufp, iv[i]);
+                bufp = hex_byte_pack(bufp, iv[i]);
 out:
         return ascii_buf;
 }
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index eca51918c951..0b3f5d72af1c 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -1065,7 +1065,7 @@ long keyctl_instantiate_key_iov(key_serial_t id,
                 goto no_payload;
 
         ret = rw_copy_check_uvector(WRITE, _payload_iov, ioc,
-                                    ARRAY_SIZE(iovstack), iovstack, &iov);
+                                    ARRAY_SIZE(iovstack), iovstack, &iov, 1);
         if (ret < 0)
                 return ret;
         if (ret == 0)
diff --git a/security/keys/trusted.c b/security/keys/trusted.c
index 0964fc236946..0ed5fdf238a2 100644
--- a/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@ -1098,7 +1098,7 @@ static long trusted_read(const struct key *key, char __user *buffer,
 
         bufp = ascii_buf;
         for (i = 0; i < p->blob_len; i++)
-                bufp = pack_hex_byte(bufp, p->blob[i]);
+                bufp = hex_byte_pack(bufp, p->blob[i]);
         if ((copy_to_user(buffer, ascii_buf, 2 * p->blob_len)) != 0) {
                 kfree(ascii_buf);
                 return -EFAULT;
diff --git a/security/keys/user_defined.c b/security/keys/user_defined.c
index 5b366d7af3c4..69ff52c08e97 100644
--- a/security/keys/user_defined.c
+++ b/security/keys/user_defined.c
@@ -102,7 +102,8 @@ int user_update(struct key *key, const void *data, size_t datalen)
                 key->expiry = 0;
         }
 
-        kfree_rcu(zap, rcu);
+        if (zap)
+                kfree_rcu(zap, rcu);
 
 error:
         return ret;
diff --git a/security/security.c b/security/security.c
index c1d69875db6c..0c6cc69c8f86 100644
--- a/security/security.c
+++ b/security/security.c
@@ -1151,6 +1151,7 @@ void security_sk_clone(const struct sock *sk, struct sock *newsk)
 {
         security_ops->sk_clone_security(sk, newsk);
 }
+EXPORT_SYMBOL(security_sk_clone);
 
 void security_sk_classify_flow(struct sock *sk, struct flowi *fl)
 {
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index e545b9f67072..1126c10a5e82 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -80,6 +80,7 @@
 #include <linux/posix-timers.h>
 #include <linux/syslog.h>
 #include <linux/user_namespace.h>
+#include <linux/export.h>
 
 #include "avc.h"
 #include "objsec.h"
diff --git a/security/selinux/netlink.c b/security/selinux/netlink.c
index ce3f481558d8..161e01a6c7ef 100644
--- a/security/selinux/netlink.c
+++ b/security/selinux/netlink.c
@@ -14,6 +14,7 @@
 #include <linux/slab.h>
 #include <linux/stddef.h>
 #include <linux/kernel.h>
+#include <linux/export.h>
 #include <linux/skbuff.h>
 #include <linux/netlink.h>
 #include <linux/selinux_netlink.h>
diff --git a/security/tomoyo/common.c b/security/tomoyo/common.c
index 610b535108af..c47d3ce6c733 100644
--- a/security/tomoyo/common.c
+++ b/security/tomoyo/common.c
@@ -748,8 +748,10 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head)
                       head->r.index++)
                         if (ns->profile_ptr[head->r.index])
                                 break;
-                if (head->r.index == TOMOYO_MAX_PROFILES)
+                if (head->r.index == TOMOYO_MAX_PROFILES) {
+                        head->r.eof = true;
                         return;
+                }
                 head->r.step++;
                 break;
         case 2:
@@ -761,6 +763,7 @@ static void tomoyo_read_profile(struct tomoyo_io_buffer *head)
                         tomoyo_io_printf(head, "%u-COMMENT=", index);
                         tomoyo_set_string(head, comment ? comment->name : "");
                         tomoyo_set_lf(head);
+                        tomoyo_print_namespace(head);
                         tomoyo_io_printf(head, "%u-PREFERENCE={ ", index);
                         for (i = 0; i < TOMOYO_MAX_PREF; i++)
                                 tomoyo_io_printf(head, "%s=%u ",