---

yaml --- r: 200385 b: refs/heads/master c: 4303ef1 h: refs/heads/master i: 200383: 9a1891d v: v3
git-mirror · Jun 27, 2010 · 3f1ccd9 · 3f1ccd9
1 parent ff3e2ed
commit 3f1ccd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7e27d6e778cd87b6f2415515d7127eba53fe5d02
+refs/heads/master: 4303ef19c6e6d16ea845c04b02b9cf086bcb8ed7
diff --git a/trunk/security/keys/keyctl.c b/trunk/security/keys/keyctl.c
@@ -33,7 +33,7 @@ static int key_get_type_from_user(char *type,
 	ret = strncpy_from_user(type, _type, len);
 
 	if (ret < 0)
-		return -EFAULT;
+		return ret;
 
 	if (ret == 0 || ret >= len)
 		return -EINVAL;
@@ -1080,7 +1080,7 @@ long keyctl_set_reqkey_keyring(int reqkey_defl)
 	return old_setting;
 error:
 	abort_creds(new);
-	return -EINVAL;
+	return ret;
 
 } /* end keyctl_set_reqkey_keyring() */