diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:14:38 -0400 |
| commit | d790d4d583aeaed9fc6f8a9f4d9f8ce6b1c15c7f (patch) | |
| tree | 854ab394486288d40fa8179cbfaf66e8bdc44b0f /security | |
| parent | 73b2c7165b76b20eb1290e7efebc33cfd21db1ca (diff) | |
| parent | 3a09b1be53d23df780a0cd0e4087a05e2ca4a00c (diff) | |
Merge branch 'master' into for-next
Diffstat (limited to 'security')
| -rw-r--r-- | security/keys/keyctl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/keys/keyctl.c b/security/keys/keyctl.c index 13074b454743..6261745e4459 100644 --- a/security/keys/keyctl.c +++ b/security/keys/keyctl.c | |||
| @@ -33,7 +33,7 @@ static int key_get_type_from_user(char *type, | |||
| 33 | ret = strncpy_from_user(type, _type, len); | 33 | ret = strncpy_from_user(type, _type, len); |
| 34 | 34 | ||
| 35 | if (ret < 0) | 35 | if (ret < 0) |
| 36 | return -EFAULT; | 36 | return ret; |
| 37 | 37 | ||
| 38 | if (ret == 0 || ret >= len) | 38 | if (ret == 0 || ret >= len) |
| 39 | return -EINVAL; | 39 | return -EINVAL; |
| @@ -1080,7 +1080,7 @@ set: | |||
| 1080 | return old_setting; | 1080 | return old_setting; |
| 1081 | error: | 1081 | error: |
| 1082 | abort_creds(new); | 1082 | abort_creds(new); |
| 1083 | return -EINVAL; | 1083 | return ret; |
| 1084 | 1084 | ||
| 1085 | } /* end keyctl_set_reqkey_keyring() */ | 1085 | } /* end keyctl_set_reqkey_keyring() */ |
| 1086 | 1086 | ||