keys: allow the callout data to be passed as a blob rather than a string

Allow the callout data to be passed as a blob rather than a string for
internal kernel services that call any request_key_*() interface other than
request_key().  request_key() itself still takes a NUL-terminated string.

The functions that change are:

	request_key_with_auxdata()
	request_key_async()
	request_key_async_with_auxdata()

Signed-off-by: David Howells <dhowells@redhat.com>
Cc: Paul Moore <paul.moore@hp.com>
Cc: Chris Wright <chrisw@sous-sol.org>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: James Morris <jmorris@namei.org>
Cc: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c
index 8ec84326a983..1698bf90ee84 100644
--- a/security/keys/keyctl.c
+++ b/security/keys/keyctl.c
@@ -152,6 +152,7 @@ asmlinkage long sys_request_key(const char __user *_type,
         struct key_type *ktype;
         struct key *key;
         key_ref_t dest_ref;
+        size_t callout_len;
         char type[32], *description, *callout_info;
         long ret;
 
@@ -169,12 +170,14 @@ asmlinkage long sys_request_key(const char __user *_type,
 
         /* pull the callout info into kernel space */
         callout_info = NULL;
+        callout_len = 0;
         if (_callout_info) {
                 callout_info = strndup_user(_callout_info, PAGE_SIZE);
                 if (IS_ERR(callout_info)) {
                         ret = PTR_ERR(callout_info);
                         goto error2;
                 }
+                callout_len = strlen(callout_info);
         }
 
         /* get the destination keyring if specified */
@@ -195,8 +198,8 @@ asmlinkage long sys_request_key(const char __user *_type,
         }
 
         /* do the search */
-        key = request_key_and_link(ktype, description, callout_info, NULL,
-                                   key_ref_to_ptr(dest_ref),
+        key = request_key_and_link(ktype, description, callout_info,
+                                   callout_len, NULL, key_ref_to_ptr(dest_ref),
                                    KEY_ALLOC_IN_QUOTA);
         if (IS_ERR(key)) {
                 ret = PTR_ERR(key);