← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-linaro-mx51/quantal

« back to all changes in this revision

Viewing changes to security/keys/process_keys.c

  • Committer: Package Import Robot
  • Author(s): John Rigby, John Rigby
  • Date: 2011-09-26 10:44:23 UTC
  • Revision ID: package-import@ubuntu.com-20110926104423-3o58a3c1bj7x00rs
Tags: 3.0.0-1007.9
https://launchpad.net/bugs/826021
[ John Rigby ]

Enable crypto modules and remove crypto-modules from
exclude-module files
LP: #826021

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/keys/process_keys.c
331
331
key_ref_t search_my_process_keyrings(struct key_type *type,
332
332
                                     const void *description,
333
333
                                     key_match_func_t match,
 
334
                                     bool no_state_check,
334
335
                                     const struct cred *cred)
335
336
{
336
337
        key_ref_t key_ref, ret, err;
350
351
        if (cred->thread_keyring) {
351
352
                key_ref = keyring_search_aux(
352
353
                        make_key_ref(cred->thread_keyring, 1),
353
 
                        cred, type, description, match);
 
354
                        cred, type, description, match, no_state_check);
354
355
                if (!IS_ERR(key_ref))
355
356
                        goto found;
356
357
 
371
372
        if (cred->tgcred->process_keyring) {
372
373
                key_ref = keyring_search_aux(
373
374
                        make_key_ref(cred->tgcred->process_keyring, 1),
374
 
                        cred, type, description, match);
 
375
                        cred, type, description, match, no_state_check);
375
376
                if (!IS_ERR(key_ref))
376
377
                        goto found;
377
378
 
395
396
                        make_key_ref(rcu_dereference(
396
397
                                             cred->tgcred->session_keyring),
397
398
                                     1),
398
 
                        cred, type, description, match);
 
399
                        cred, type, description, match, no_state_check);
399
400
                rcu_read_unlock();
400
401
 
401
402
                if (!IS_ERR(key_ref))
417
418
        else if (cred->user->session_keyring) {
418
419
                key_ref = keyring_search_aux(
419
420
                        make_key_ref(cred->user->session_keyring, 1),
420
 
                        cred, type, description, match);
 
421
                        cred, type, description, match, no_state_check);
421
422
                if (!IS_ERR(key_ref))
422
423
                        goto found;
423
424
 
459
460
 
460
461
        might_sleep();
461
462
 
462
 
        key_ref = search_my_process_keyrings(type, description, match, cred);
 
463
        key_ref = search_my_process_keyrings(type, description, match,
 
464
                                             false, cred);
463
465
        if (!IS_ERR(key_ref))
464
466
                goto found;
465
467
        err = key_ref;