summaryrefslogtreecommitdiffstats
path: root/ncr-key.c
diff options
context:
space:
mode:
authorMiloslav Trmač <mitr@redhat.com>2010-08-11 17:46:44 +0200
committerMiloslav Trmač <mitr@redhat.com>2010-08-24 22:51:37 +0200
commit491fc6dd6fff9b4d9676e03189ae76538184b51d (patch)
tree8281350eddfda38c245a5983f9594f35a6476365 /ncr-key.c
parentdbb2f11a32cdde060798c14cdac33f95e22f39bb (diff)
downloadcryptodev-linux-491fc6dd6fff9b4d9676e03189ae76538184b51d.tar.gz
cryptodev-linux-491fc6dd6fff9b4d9676e03189ae76538184b51d.tar.xz
cryptodev-linux-491fc6dd6fff9b4d9676e03189ae76538184b51d.zip
Convert *_KEY_INIT
Diffstat (limited to 'ncr-key.c')
-rw-r--r--ncr-key.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/ncr-key.c b/ncr-key.c
index 95228f2..f54ef33 100644
--- a/ncr-key.c
+++ b/ncr-key.c
@@ -148,7 +148,7 @@ static void _ncr_key_remove(struct ncr_lists *lst, ncr_key_t desc)
_ncr_key_item_put(item);
}
-int ncr_key_init(struct ncr_lists *lst, void __user* arg)
+int ncr_key_init(struct ncr_lists *lst)
{
ncr_key_t desc;
struct key_item_st* key;
@@ -187,12 +187,7 @@ int ncr_key_init(struct ncr_lists *lst, void __user* arg)
desc = key->desc;
mutex_unlock(&lst->key_idr_mutex);
- ret = copy_to_user(arg, &desc, sizeof(desc));
- if (unlikely(ret)) {
- _ncr_key_remove(lst, desc);
- return -EFAULT;
- }
- return ret;
+ return desc;
err_limits:
ncr_limits_remove(current_euid(), task_pid_nr(current), LIMIT_TYPE_KEY);