diff options
| author | David Howells <dhowells@redhat.com> | 2006-06-29 02:24:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-29 10:26:20 -0700 |
| commit | 4e54f08543d05e519e601368571cc3787fefae96 (patch) | |
| tree | 0cd9d982e5bb25abcb9251d26c36ff11e7dc81a5 /security/keys/keyctl.c | |
| parent | 94583779e6625154e8d7fce33d097ae7d089e9de (diff) | |
| download | linux-3.10-4e54f08543d05e519e601368571cc3787fefae96.tar.gz linux-3.10-4e54f08543d05e519e601368571cc3787fefae96.tar.bz2 linux-3.10-4e54f08543d05e519e601368571cc3787fefae96.zip | |
[PATCH] Keys: Allow in-kernel key requestor to pass auxiliary data to upcaller
The proposed NFS key type uses its own method of passing key requests to
userspace (upcalling) rather than invoking /sbin/request-key. This is
because the responsible userspace daemon should already be running and will
be contacted through rpc_pipefs.
This patch permits the NFS filesystem to pass auxiliary data to the upcall
operation (struct key_type::request_key) so that the upcaller can use a
pre-existing communications channel more easily.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-By: Kevin Coffman <kwc@citi.umich.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'security/keys/keyctl.c')
| -rw-r--r-- | security/keys/keyctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 329411cf876..d9ca15c109c 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c @@ -183,7 +183,7 @@ asmlinkage long sys_request_key(const char __user *_type, } /* do the search */ - key = request_key_and_link(ktype, description, callout_info, + key = request_key_and_link(ktype, description, callout_info, NULL, key_ref_to_ptr(dest_ref), KEY_ALLOC_IN_QUOTA); if (IS_ERR(key)) { |