diff options
Diffstat (limited to 'security/keys/request_key_auth.c')
| -rw-r--r-- | security/keys/request_key_auth.c | 7 | 
1 files changed, 3 insertions, 4 deletions
diff --git a/security/keys/request_key_auth.c b/security/keys/request_key_auth.c index ecba39c93fd9..41e9735006d0 100644 --- a/security/keys/request_key_auth.c +++ b/security/keys/request_key_auth.c @@ -22,7 +22,7 @@ static int request_key_auth_instantiate(struct key *,  static void request_key_auth_describe(const struct key *, struct seq_file *);  static void request_key_auth_revoke(struct key *);  static void request_key_auth_destroy(struct key *); -static long request_key_auth_read(const struct key *, char __user *, size_t); +static long request_key_auth_read(const struct key *, char *, size_t);  /*   * The request-key authorisation key type definition. @@ -80,7 +80,7 @@ static void request_key_auth_describe(const struct key *key,   * - the key's semaphore is read-locked   */  static long request_key_auth_read(const struct key *key, -				  char __user *buffer, size_t buflen) +				  char *buffer, size_t buflen)  {  	struct request_key_auth *rka = dereference_key_locked(key);  	size_t datalen; @@ -97,8 +97,7 @@ static long request_key_auth_read(const struct key *key,  		if (buflen > datalen)  			buflen = datalen; -		if (copy_to_user(buffer, rka->callout_info, buflen) != 0) -			ret = -EFAULT; +		memcpy(buffer, rka->callout_info, buflen);  	}  	return ret;  |