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-key.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-key.c')
| -rw-r--r-- | crypto/userspace/ncr-key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/userspace/ncr-key.c b/crypto/userspace/ncr-key.c index e0361bc8f83..4ea933cd591 100644 --- a/crypto/userspace/ncr-key.c +++ b/crypto/userspace/ncr-key.c @@ -189,9 +189,9 @@ int ncr_key_init(struct list_sem_st* lst, void __user* arg) list_add(&key->list, &lst->list); + desc = key->desc; up(&lst->sem); - desc = key->desc; ret = copy_to_user(arg, &desc, sizeof(desc)); if (unlikely(ret)) { down(&lst->sem); |