← Back to branch summary

~ubuntu-branches/ubuntu/quantal/linux-lowlatency/quantal-proposed

« back to all changes in this revision

Viewing changes to security/keys/encrypted-keys/masterkey_trusted.c

  • Committer: Package Import Robot
  • Author(s): Andy Whitcroft, Andy Whitcroft
  • Date: 2012-06-21 09:16:38 UTC
  • Revision ID: package-import@ubuntu.com-20120621091638-gubhv4nox8xez1ct
Tags: 3.5.0-1.1
[ Andy Whitcroft]

* Rebuild lowlatency against Ubuntu-3.5.0-1.1
* All new configuration system to allow configuration deltas to be
  exposed via debian.lowlatency/config-delta

Show diffs side-by-side

added added

removed removed

Lines of Context:
security/keys/encrypted-keys/masterkey_trusted.c
18
18
#include <linux/module.h>
19
19
#include <linux/err.h>
20
20
#include <keys/trusted-type.h>
 
21
#include <keys/encrypted-type.h>
 
22
#include "encrypted.h"
21
23
 
22
24
/*
23
25
 * request_trusted_key - request the trusted key
37
39
                goto error;
38
40
 
39
41
        down_read(&tkey->sem);
40
 
        tpayload = rcu_dereference(tkey->payload.data);
 
42
        tpayload = tkey->payload.data;
41
43
        *master_key = tpayload->key;
42
44
        *master_keylen = tpayload->key_len;
43
45
error: