diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2010-07-31 00:16:54 +0200 |
| commit | dbff0a8826b2dd9abc0c7699ae883a95d468b12c (patch) | |
| tree | d6f9028ade424c14cd21fd41ae21a7f417af978d /crypto/userspace/ncr.c | |
| parent | d5c2b894102e59efe499c231a32065afcf37e463 (diff) | |
| parent | af51c84e19753ec0c9de368816a30bcc4fb90c24 (diff) | |
| download | kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.gz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.tar.xz kernel-crypto-dbff0a8826b2dd9abc0c7699ae883a95d468b12c.zip | |
Merge branch 'standalone-master' into standalone-rename
Conflicts:
AUTHORS
README
TODO
userspace/setkey.c
Diffstat (limited to 'crypto/userspace/ncr.c')
| -rw-r--r-- | crypto/userspace/ncr.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/userspace/ncr.c b/crypto/userspace/ncr.c index 87bd05204a9..7608312ed7b 100644 --- a/crypto/userspace/ncr.c +++ b/crypto/userspace/ncr.c @@ -52,9 +52,6 @@ void* ncr_init_lists(void) memset(lst, 0, sizeof(*lst)); - init_MUTEX(&lst->data.sem); - INIT_LIST_HEAD(&lst->data.list); - init_MUTEX(&lst->key.sem); INIT_LIST_HEAD(&lst->key.list); @@ -106,11 +103,14 @@ struct ncr_master_key_st st; dprintk(0, KERN_DEBUG, "Master key was previously initialized.\n"); } + if (unlikely(copy_from_user(master_key.key.secret.data, st.key, st.key_size))) { + err(); + return -EFAULT; + } + dprintk(0, KERN_INFO, "Initializing master key.\n"); master_key.type = NCR_KEY_TYPE_SECRET; - - memcpy(master_key.key.secret.data, st.key, st.key_size); master_key.key.secret.size = st.key_size; return 0; |