Merge branch 'modsign-keys-devel' into security-next-keys

Signed-off-by: David Howells <dhowells@redhat.com>

diff --cc Documentation/security/keys.txt
Simple merge

diff --cc fs/cifs/cifsacl.c
Simple merge

diff --cc net/dns_resolver/dns_key.c
Simple merge

diff --cc security/keys/key.c
Simple merge

diff --cc security/keys/keyctl.c
Simple merge

diff --cc security/keys/keyring.c
Simple merge

diff --cc security/keys/trusted.c
index 3f163d0489ad2e8705a8f57c4751038b9d7d6f36,42036c7a08560d7f2b9d2cdf7197784a1cd1ec9f..e13fcf7636f7ffa0ff40d7cd60408645621dab1f
--- 1/security/keys/trusted.c
--- 2/security/keys/trusted.c
+++ b/security/keys/trusted.c
@@@ -903,9 -936,8 +904,9 @@@ static int trusted_instantiate(struct k
        char *datablob;
        int ret = 0;
        int key_cmd;
 +      size_t key_len;
  
-       if (datalen <= 0 || datalen > 32767 || !data)
+       if (datalen <= 0 || datalen > 32767 || !prep->data)
                return -EINVAL;
  
        datablob = kmalloc(datalen + 1, GFP_KERNEL);