From 491fc6dd6fff9b4d9676e03189ae76538184b51d Mon Sep 17 00:00:00 2001 From: Miloslav Trmač Date: Wed, 11 Aug 2010 17:46:44 +0200 Subject: Convert *_KEY_INIT --- ncr-key.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'ncr-key.c') 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); -- cgit