request_key.c 19.6 KB
Newer Older
1
/* Request a key from userspace
L
Linus Torvalds 已提交
2
 *
3
 * Copyright (C) 2004-2007 Red Hat, Inc. All Rights Reserved.
L
Linus Torvalds 已提交
4 5 6 7 8 9
 * Written by David Howells (dhowells@redhat.com)
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License
 * as published by the Free Software Foundation; either version
 * 2 of the License, or (at your option) any later version.
10
 *
R
Randy Dunlap 已提交
11
 * See Documentation/security/keys-request-key.txt
L
Linus Torvalds 已提交
12 13 14 15 16 17
 */

#include <linux/module.h>
#include <linux/sched.h>
#include <linux/kmod.h>
#include <linux/err.h>
18
#include <linux/keyctl.h>
19
#include <linux/slab.h>
L
Linus Torvalds 已提交
20 21
#include "internal.h"

D
David Howells 已提交
22 23
#define key_negative_timeout	60	/* default timeout on a negative key's existence */

24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41
/*
 * wait_on_bit() sleep function for uninterruptible waiting
 */
static int key_wait_bit(void *flags)
{
	schedule();
	return 0;
}

/*
 * wait_on_bit() sleep function for interruptible waiting
 */
static int key_wait_bit_intr(void *flags)
{
	schedule();
	return signal_pending(current) ? -ERESTARTSYS : 0;
}

42 43 44 45 46 47 48 49
/**
 * complete_request_key - Complete the construction of a key.
 * @cons: The key construction record.
 * @error: The success or failute of the construction.
 *
 * Complete the attempt to construct a key.  The key will be negated
 * if an error is indicated.  The authorisation key will be revoked
 * unconditionally.
50 51 52 53
 */
void complete_request_key(struct key_construction *cons, int error)
{
	kenter("{%d,%d},%d", cons->key->serial, cons->authkey->serial, error);
L
Linus Torvalds 已提交
54

55 56 57 58 59 60 61 62 63 64 65
	if (error < 0)
		key_negate_and_link(cons->key, key_negative_timeout, NULL,
				    cons->authkey);
	else
		key_revoke(cons->authkey);

	key_put(cons->key);
	key_put(cons->authkey);
	kfree(cons);
}
EXPORT_SYMBOL(complete_request_key);
L
Linus Torvalds 已提交
66

67 68 69 70 71 72 73
/*
 * Initialise a usermode helper that is going to have a specific session
 * keyring.
 *
 * This is called in context of freshly forked kthread before kernel_execve(),
 * so we can simply install the desired session_keyring at this point.
 */
74
static int umh_keys_init(struct subprocess_info *info, struct cred *cred)
75 76
{
	struct key *keyring = info->data;
77

78 79 80
	return install_session_keyring_to_cred(cred, keyring);
}

81 82 83
/*
 * Clean up a usermode helper with session keyring.
 */
84 85 86 87 88 89
static void umh_keys_cleanup(struct subprocess_info *info)
{
	struct key *keyring = info->data;
	key_put(keyring);
}

90 91 92
/*
 * Call a usermode helper with a specific session keyring.
 */
93
static int call_usermodehelper_keys(char *path, char **argv, char **envp,
94
					struct key *session_keyring, int wait)
95
{
96 97 98 99 100 101 102 103 104 105
	struct subprocess_info *info;

	info = call_usermodehelper_setup(path, argv, envp, GFP_KERNEL,
					  umh_keys_init, umh_keys_cleanup,
					  session_keyring);
	if (!info)
		return -ENOMEM;

	key_get(session_keyring);
	return call_usermodehelper_exec(info, wait);
106 107
}

L
Linus Torvalds 已提交
108
/*
109
 * Request userspace finish the construction of a key
110
 * - execute "/sbin/request-key <op> <key> <uid> <gid> <keyring> <keyring> <keyring>"
L
Linus Torvalds 已提交
111
 */
112
static int call_sbin_request_key(struct key_construction *cons,
113 114
				 const char *op,
				 void *aux)
L
Linus Torvalds 已提交
115
{
116
	const struct cred *cred = current_cred();
L
Linus Torvalds 已提交
117
	key_serial_t prkey, sskey;
D
David Howells 已提交
118 119
	struct key *key = cons->key, *authkey = cons->authkey, *keyring,
		*session;
120
	char *argv[9], *envp[3], uid_str[12], gid_str[12];
L
Linus Torvalds 已提交
121
	char key_str[12], keyring_str[3][12];
122
	char desc[20];
123 124
	int ret, i;

125
	kenter("{%d},{%d},%s", key->serial, authkey->serial, op);
126

127 128 129 130
	ret = install_user_keyrings();
	if (ret < 0)
		goto error_alloc;

131 132 133
	/* allocate a new session keyring */
	sprintf(desc, "_req.%u", key->serial);

D
David Howells 已提交
134 135
	cred = get_current_cred();
	keyring = keyring_alloc(desc, cred->fsuid, cred->fsgid, cred,
136
				KEY_POS_ALL | KEY_USR_VIEW | KEY_USR_READ,
137
				KEY_ALLOC_QUOTA_OVERRUN, NULL);
D
David Howells 已提交
138
	put_cred(cred);
139 140 141
	if (IS_ERR(keyring)) {
		ret = PTR_ERR(keyring);
		goto error_alloc;
142
	}
L
Linus Torvalds 已提交
143

144
	/* attach the auth key to the session keyring */
145
	ret = key_link(keyring, authkey);
146 147 148
	if (ret < 0)
		goto error_link;

L
Linus Torvalds 已提交
149
	/* record the UID and GID */
150 151
	sprintf(uid_str, "%d", from_kuid(&init_user_ns, cred->fsuid));
	sprintf(gid_str, "%d", from_kgid(&init_user_ns, cred->fsgid));
L
Linus Torvalds 已提交
152 153 154 155 156 157

	/* we say which key is under construction */
	sprintf(key_str, "%d", key->serial);

	/* we specify the process's default keyrings */
	sprintf(keyring_str[0], "%d",
D
David Howells 已提交
158
		cred->thread_keyring ? cred->thread_keyring->serial : 0);
L
Linus Torvalds 已提交
159 160

	prkey = 0;
161 162
	if (cred->process_keyring)
		prkey = cred->process_keyring->serial;
163
	sprintf(keyring_str[1], "%d", prkey);
L
Linus Torvalds 已提交
164

D
David Howells 已提交
165
	rcu_read_lock();
166
	session = rcu_dereference(cred->session_keyring);
D
David Howells 已提交
167 168 169 170
	if (!session)
		session = cred->user->session_keyring;
	sskey = session->serial;
	rcu_read_unlock();
L
Linus Torvalds 已提交
171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192

	sprintf(keyring_str[2], "%d", sskey);

	/* set up a minimal environment */
	i = 0;
	envp[i++] = "HOME=/";
	envp[i++] = "PATH=/sbin:/bin:/usr/sbin:/usr/bin";
	envp[i] = NULL;

	/* set up the argument list */
	i = 0;
	argv[i++] = "/sbin/request-key";
	argv[i++] = (char *) op;
	argv[i++] = key_str;
	argv[i++] = uid_str;
	argv[i++] = gid_str;
	argv[i++] = keyring_str[0];
	argv[i++] = keyring_str[1];
	argv[i++] = keyring_str[2];
	argv[i] = NULL;

	/* do it */
193 194
	ret = call_usermodehelper_keys(argv[0], argv, envp, keyring,
				       UMH_WAIT_PROC);
195 196 197 198 199 200 201 202 203 204 205
	kdebug("usermode -> 0x%x", ret);
	if (ret >= 0) {
		/* ret is the exit/wait code */
		if (test_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags) ||
		    key_validate(key) < 0)
			ret = -ENOKEY;
		else
			/* ignore any errors from userspace if the key was
			 * instantiated */
			ret = 0;
	}
206

207 208
error_link:
	key_put(keyring);
209

210
error_alloc:
211
	complete_request_key(cons, ret);
D
David Howells 已提交
212
	kleave(" = %d", ret);
213
	return ret;
214
}
L
Linus Torvalds 已提交
215 216

/*
217 218 219
 * Call out to userspace for key construction.
 *
 * Program failure is ignored in favour of key status.
L
Linus Torvalds 已提交
220
 */
221
static int construct_key(struct key *key, const void *callout_info,
222 223
			 size_t callout_len, void *aux,
			 struct key *dest_keyring)
L
Linus Torvalds 已提交
224
{
225
	struct key_construction *cons;
226
	request_key_actor_t actor;
227 228
	struct key *authkey;
	int ret;
L
Linus Torvalds 已提交
229

230
	kenter("%d,%p,%zu,%p", key->serial, callout_info, callout_len, aux);
231

232 233 234
	cons = kmalloc(sizeof(*cons), GFP_KERNEL);
	if (!cons)
		return -ENOMEM;
L
Linus Torvalds 已提交
235

236
	/* allocate an authorisation key */
237 238
	authkey = request_key_auth_new(key, callout_info, callout_len,
				       dest_keyring);
239
	if (IS_ERR(authkey)) {
240
		kfree(cons);
241 242
		ret = PTR_ERR(authkey);
		authkey = NULL;
243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258
	} else {
		cons->authkey = key_get(authkey);
		cons->key = key_get(key);

		/* make the call */
		actor = call_sbin_request_key;
		if (key->type->request_key)
			actor = key->type->request_key;

		ret = actor(cons, "create", aux);

		/* check that the actor called complete_request_key() prior to
		 * returning an error */
		WARN_ON(ret < 0 &&
			!test_bit(KEY_FLAG_REVOKED, &authkey->flags));
		key_put(authkey);
L
Linus Torvalds 已提交
259 260
	}

261 262 263
	kleave(" = %d", ret);
	return ret;
}
L
Linus Torvalds 已提交
264

265
/*
266 267 268 269
 * Get the appropriate destination keyring for the request.
 *
 * The keyring selected is returned with an extra reference upon it which the
 * caller must release.
270
 */
271
static void construct_get_dest_keyring(struct key **_dest_keyring)
272
{
273
	struct request_key_auth *rka;
274
	const struct cred *cred = current_cred();
275
	struct key *dest_keyring = *_dest_keyring, *authkey;
276

277
	kenter("%p", dest_keyring);
278 279

	/* find the appropriate keyring */
280 281 282 283 284 285
	if (dest_keyring) {
		/* the caller supplied one */
		key_get(dest_keyring);
	} else {
		/* use a default keyring; falling through the cases until we
		 * find one that we actually have */
286
		switch (cred->jit_keyring) {
287
		case KEY_REQKEY_DEFL_DEFAULT:
288
		case KEY_REQKEY_DEFL_REQUESTOR_KEYRING:
289 290
			if (cred->request_key_auth) {
				authkey = cred->request_key_auth;
291 292 293 294 295 296 297 298 299 300 301
				down_read(&authkey->sem);
				rka = authkey->payload.data;
				if (!test_bit(KEY_FLAG_REVOKED,
					      &authkey->flags))
					dest_keyring =
						key_get(rka->dest_keyring);
				up_read(&authkey->sem);
				if (dest_keyring)
					break;
			}

302
		case KEY_REQKEY_DEFL_THREAD_KEYRING:
303
			dest_keyring = key_get(cred->thread_keyring);
304 305 306 307
			if (dest_keyring)
				break;

		case KEY_REQKEY_DEFL_PROCESS_KEYRING:
308
			dest_keyring = key_get(cred->process_keyring);
309 310 311 312 313 314
			if (dest_keyring)
				break;

		case KEY_REQKEY_DEFL_SESSION_KEYRING:
			rcu_read_lock();
			dest_keyring = key_get(
315
				rcu_dereference(cred->session_keyring));
316 317 318 319 320 321
			rcu_read_unlock();

			if (dest_keyring)
				break;

		case KEY_REQKEY_DEFL_USER_SESSION_KEYRING:
322
			dest_keyring =
323
				key_get(cred->user->session_keyring);
324 325 326
			break;

		case KEY_REQKEY_DEFL_USER_KEYRING:
327
			dest_keyring = key_get(cred->user->uid_keyring);
328 329 330 331 332 333 334 335
			break;

		case KEY_REQKEY_DEFL_GROUP_KEYRING:
		default:
			BUG();
		}
	}

336 337 338
	*_dest_keyring = dest_keyring;
	kleave(" [dk %d]", key_serial(dest_keyring));
	return;
339
}
340

341
/*
342 343 344 345 346
 * Allocate a new key in under-construction state and attempt to link it in to
 * the requested keyring.
 *
 * May return a key that's already under construction instead if there was a
 * race between two thread calling request_key().
347
 */
348
static int construct_alloc_key(struct keyring_search_context *ctx,
349 350 351 352 353
			       struct key *dest_keyring,
			       unsigned long flags,
			       struct key_user *user,
			       struct key **_key)
{
354
	unsigned long prealloc;
355
	struct key *key;
356
	key_perm_t perm;
357
	key_ref_t key_ref;
358
	int ret;
359

360 361
	kenter("%s,%s,,,",
	       ctx->index_key.type->name, ctx->index_key.description);
362

363
	*_key = NULL;
364 365
	mutex_lock(&user->cons_lock);

366 367
	perm = KEY_POS_VIEW | KEY_POS_SEARCH | KEY_POS_LINK | KEY_POS_SETATTR;
	perm |= KEY_USR_VIEW;
368
	if (ctx->index_key.type->read)
369
		perm |= KEY_POS_READ;
370 371
	if (ctx->index_key.type == &key_type_keyring ||
	    ctx->index_key.type->update)
372 373
		perm |= KEY_POS_WRITE;

374 375
	key = key_alloc(ctx->index_key.type, ctx->index_key.description,
			ctx->cred->fsuid, ctx->cred->fsgid, ctx->cred,
376
			perm, flags);
377 378 379 380 381
	if (IS_ERR(key))
		goto alloc_failed;

	set_bit(KEY_FLAG_USER_CONSTRUCT, &key->flags);

382
	if (dest_keyring) {
383
		ret = __key_link_begin(dest_keyring, &ctx->index_key, &prealloc);
384 385 386
		if (ret < 0)
			goto link_prealloc_failed;
	}
387 388 389 390 391 392

	/* attach the key to the destination keyring under lock, but we do need
	 * to do another check just in case someone beat us to it whilst we
	 * waited for locks */
	mutex_lock(&key_construction_mutex);

393
	key_ref = search_process_keyrings(ctx);
394 395 396
	if (!IS_ERR(key_ref))
		goto key_already_present;

397
	if (dest_keyring)
398
		__key_link(dest_keyring, key, &prealloc);
399 400

	mutex_unlock(&key_construction_mutex);
401
	if (dest_keyring)
402
		__key_link_end(dest_keyring, &ctx->index_key, prealloc);
403 404 405 406 407
	mutex_unlock(&user->cons_lock);
	*_key = key;
	kleave(" = 0 [%d]", key_serial(key));
	return 0;

408 409
	/* the key is now present - we tell the caller that we found it by
	 * returning -EINPROGRESS  */
410
key_already_present:
411
	key_put(key);
412
	mutex_unlock(&key_construction_mutex);
413
	key = key_ref_to_ptr(key_ref);
414
	if (dest_keyring) {
415 416 417
		ret = __key_link_check_live_key(dest_keyring, key);
		if (ret == 0)
			__key_link(dest_keyring, key, &prealloc);
418
		__key_link_end(dest_keyring, &ctx->index_key, prealloc);
419 420
		if (ret < 0)
			goto link_check_failed;
421
	}
422
	mutex_unlock(&user->cons_lock);
423
	*_key = key;
424 425 426
	kleave(" = -EINPROGRESS [%d]", key_serial(key));
	return -EINPROGRESS;

427 428 429 430 431 432 433 434 435 436 437
link_check_failed:
	mutex_unlock(&user->cons_lock);
	key_put(key);
	kleave(" = %d [linkcheck]", ret);
	return ret;

link_prealloc_failed:
	mutex_unlock(&user->cons_lock);
	kleave(" = %d [prelink]", ret);
	return ret;

438 439 440 441 442 443 444
alloc_failed:
	mutex_unlock(&user->cons_lock);
	kleave(" = %ld", PTR_ERR(key));
	return PTR_ERR(key);
}

/*
445
 * Commence key construction.
446
 */
447
static struct key *construct_key_and_link(struct keyring_search_context *ctx,
448
					  const char *callout_info,
449
					  size_t callout_len,
450 451 452 453 454 455 456 457
					  void *aux,
					  struct key *dest_keyring,
					  unsigned long flags)
{
	struct key_user *user;
	struct key *key;
	int ret;

D
David Howells 已提交
458 459
	kenter("");

460
	user = key_user_lookup(current_fsuid());
461 462 463
	if (!user)
		return ERR_PTR(-ENOMEM);

464 465
	construct_get_dest_keyring(&dest_keyring);

466
	ret = construct_alloc_key(ctx, dest_keyring, flags, user, &key);
467 468 469
	key_user_put(user);

	if (ret == 0) {
470 471
		ret = construct_key(key, callout_info, callout_len, aux,
				    dest_keyring);
D
David Howells 已提交
472 473
		if (ret < 0) {
			kdebug("cons failed");
474
			goto construction_failed;
D
David Howells 已提交
475
		}
476 477 478
	} else if (ret == -EINPROGRESS) {
		ret = 0;
	} else {
479
		goto couldnt_alloc_key;
480 481
	}

482
	key_put(dest_keyring);
D
David Howells 已提交
483
	kleave(" = key %d", key_serial(key));
484 485 486 487 488
	return key;

construction_failed:
	key_negate_and_link(key, key_negative_timeout, NULL, NULL);
	key_put(key);
489
couldnt_alloc_key:
490
	key_put(dest_keyring);
D
David Howells 已提交
491
	kleave(" = %d", ret);
492 493
	return ERR_PTR(ret);
}
494

495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520
/**
 * request_key_and_link - Request a key and cache it in a keyring.
 * @type: The type of key we want.
 * @description: The searchable description of the key.
 * @callout_info: The data to pass to the instantiation upcall (or NULL).
 * @callout_len: The length of callout_info.
 * @aux: Auxiliary data for the upcall.
 * @dest_keyring: Where to cache the key.
 * @flags: Flags to key_alloc().
 *
 * A key matching the specified criteria is searched for in the process's
 * keyrings and returned with its usage count incremented if found.  Otherwise,
 * if callout_info is not NULL, a key will be allocated and some service
 * (probably in userspace) will be asked to instantiate it.
 *
 * If successfully found or created, the key will be linked to the destination
 * keyring if one is provided.
 *
 * Returns a pointer to the key if successful; -EACCES, -ENOKEY, -EKEYREVOKED
 * or -EKEYEXPIRED if an inaccessible, negative, revoked or expired key was
 * found; -ENOKEY if no key was found and no @callout_info was given; -EDQUOT
 * if insufficient key quota was available to create a new key; or -ENOMEM if
 * insufficient memory was available.
 *
 * If the returned key was created, then it may still be under construction,
 * and wait_for_key_construction() should be used to wait for that to complete.
L
Linus Torvalds 已提交
521
 */
522 523
struct key *request_key_and_link(struct key_type *type,
				 const char *description,
524 525
				 const void *callout_info,
				 size_t callout_len,
526
				 void *aux,
527 528
				 struct key *dest_keyring,
				 unsigned long flags)
L
Linus Torvalds 已提交
529
{
530 531 532 533 534 535 536 537
	struct keyring_search_context ctx = {
		.index_key.type		= type,
		.index_key.description	= description,
		.cred			= current_cred(),
		.match			= type->match,
		.match_data		= description,
		.flags			= KEYRING_SEARCH_LOOKUP_DIRECT,
	};
L
Linus Torvalds 已提交
538
	struct key *key;
539
	key_ref_t key_ref;
540
	int ret;
L
Linus Torvalds 已提交
541

542
	kenter("%s,%s,%p,%zu,%p,%p,%lx",
543 544
	       ctx.index_key.type->name, ctx.index_key.description,
	       callout_info, callout_len, aux, dest_keyring, flags);
545

L
Linus Torvalds 已提交
546
	/* search all the process keyrings for a key */
547
	key_ref = search_process_keyrings(&ctx);
L
Linus Torvalds 已提交
548

549 550
	if (!IS_ERR(key_ref)) {
		key = key_ref_to_ptr(key_ref);
551 552
		if (dest_keyring) {
			construct_get_dest_keyring(&dest_keyring);
553
			ret = key_link(dest_keyring, key);
554
			key_put(dest_keyring);
555 556 557 558 559
			if (ret < 0) {
				key_put(key);
				key = ERR_PTR(ret);
				goto error;
			}
560
		}
561
	} else if (PTR_ERR(key_ref) != -EAGAIN) {
562
		key = ERR_CAST(key_ref);
563
	} else  {
L
Linus Torvalds 已提交
564 565 566 567 568 569
		/* the search failed, but the keyrings were searchable, so we
		 * should consult userspace if we can */
		key = ERR_PTR(-ENOKEY);
		if (!callout_info)
			goto error;

570 571
		key = construct_key_and_link(&ctx, callout_info, callout_len,
					     aux, dest_keyring, flags);
L
Linus Torvalds 已提交
572 573
	}

574 575
error:
	kleave(" = %p", key);
L
Linus Torvalds 已提交
576
	return key;
577
}
L
Linus Torvalds 已提交
578

579 580 581 582 583 584 585 586 587 588
/**
 * wait_for_key_construction - Wait for construction of a key to complete
 * @key: The key being waited for.
 * @intr: Whether to wait interruptibly.
 *
 * Wait for a key to finish being constructed.
 *
 * Returns 0 if successful; -ERESTARTSYS if the wait was interrupted; -ENOKEY
 * if the key was negated; or -EKEYREVOKED or -EKEYEXPIRED if the key was
 * revoked or expired.
589 590 591 592
 */
int wait_for_key_construction(struct key *key, bool intr)
{
	int ret;
593

594 595 596 597 598
	ret = wait_on_bit(&key->flags, KEY_FLAG_USER_CONSTRUCT,
			  intr ? key_wait_bit_intr : key_wait_bit,
			  intr ? TASK_INTERRUPTIBLE : TASK_UNINTERRUPTIBLE);
	if (ret < 0)
		return ret;
599
	if (test_bit(KEY_FLAG_NEGATIVE, &key->flags))
600
		return key->type_data.reject_error;
601 602 603
	return key_validate(key);
}
EXPORT_SYMBOL(wait_for_key_construction);
604

605 606 607 608 609 610 611 612 613 614 615 616 617
/**
 * request_key - Request a key and wait for construction
 * @type: Type of key.
 * @description: The searchable description of the key.
 * @callout_info: The data to pass to the instantiation upcall (or NULL).
 *
 * As for request_key_and_link() except that it does not add the returned key
 * to a keyring if found, new keys are always allocated in the user's quota,
 * the callout_info must be a NUL-terminated string and no auxiliary data can
 * be passed.
 *
 * Furthermore, it then works as wait_for_key_construction() to wait for the
 * completion of keys undergoing construction with a non-interruptible wait.
618 619 620 621 622
 */
struct key *request_key(struct key_type *type,
			const char *description,
			const char *callout_info)
{
623
	struct key *key;
624
	size_t callout_len = 0;
625 626
	int ret;

627 628 629 630
	if (callout_info)
		callout_len = strlen(callout_info);
	key = request_key_and_link(type, description, callout_info, callout_len,
				   NULL, NULL, KEY_ALLOC_IN_QUOTA);
631 632 633 634 635 636 637 638 639
	if (!IS_ERR(key)) {
		ret = wait_for_key_construction(key, false);
		if (ret < 0) {
			key_put(key);
			return ERR_PTR(ret);
		}
	}
	return key;
}
L
Linus Torvalds 已提交
640
EXPORT_SYMBOL(request_key);
641

642 643 644 645 646 647 648 649 650 651 652 653 654
/**
 * request_key_with_auxdata - Request a key with auxiliary data for the upcaller
 * @type: The type of key we want.
 * @description: The searchable description of the key.
 * @callout_info: The data to pass to the instantiation upcall (or NULL).
 * @callout_len: The length of callout_info.
 * @aux: Auxiliary data for the upcall.
 *
 * As for request_key_and_link() except that it does not add the returned key
 * to a keyring if found and new keys are always allocated in the user's quota.
 *
 * Furthermore, it then works as wait_for_key_construction() to wait for the
 * completion of keys undergoing construction with a non-interruptible wait.
655 656 657
 */
struct key *request_key_with_auxdata(struct key_type *type,
				     const char *description,
658 659
				     const void *callout_info,
				     size_t callout_len,
660 661
				     void *aux)
{
662 663 664
	struct key *key;
	int ret;

665 666
	key = request_key_and_link(type, description, callout_info, callout_len,
				   aux, NULL, KEY_ALLOC_IN_QUOTA);
667 668 669 670 671 672 673 674 675 676
	if (!IS_ERR(key)) {
		ret = wait_for_key_construction(key, false);
		if (ret < 0) {
			key_put(key);
			return ERR_PTR(ret);
		}
	}
	return key;
}
EXPORT_SYMBOL(request_key_with_auxdata);
677

678
/*
679 680 681 682 683 684 685 686 687 688 689 690
 * request_key_async - Request a key (allow async construction)
 * @type: Type of key.
 * @description: The searchable description of the key.
 * @callout_info: The data to pass to the instantiation upcall (or NULL).
 * @callout_len: The length of callout_info.
 *
 * As for request_key_and_link() except that it does not add the returned key
 * to a keyring if found, new keys are always allocated in the user's quota and
 * no auxiliary data can be passed.
 *
 * The caller should call wait_for_key_construction() to wait for the
 * completion of the returned key if it is still undergoing construction.
691 692 693
 */
struct key *request_key_async(struct key_type *type,
			      const char *description,
694 695
			      const void *callout_info,
			      size_t callout_len)
696
{
697 698 699
	return request_key_and_link(type, description, callout_info,
				    callout_len, NULL, NULL,
				    KEY_ALLOC_IN_QUOTA);
700 701
}
EXPORT_SYMBOL(request_key_async);
702

703 704
/*
 * request a key with auxiliary data for the upcaller (allow async construction)
705 706 707 708 709 710 711 712 713 714 715
 * @type: Type of key.
 * @description: The searchable description of the key.
 * @callout_info: The data to pass to the instantiation upcall (or NULL).
 * @callout_len: The length of callout_info.
 * @aux: Auxiliary data for the upcall.
 *
 * As for request_key_and_link() except that it does not add the returned key
 * to a keyring if found and new keys are always allocated in the user's quota.
 *
 * The caller should call wait_for_key_construction() to wait for the
 * completion of the returned key if it is still undergoing construction.
716 717 718
 */
struct key *request_key_async_with_auxdata(struct key_type *type,
					   const char *description,
719 720
					   const void *callout_info,
					   size_t callout_len,
721 722
					   void *aux)
{
723 724
	return request_key_and_link(type, description, callout_info,
				    callout_len, aux, NULL, KEY_ALLOC_IN_QUOTA);
725 726
}
EXPORT_SYMBOL(request_key_async_with_auxdata);