diff options
| author | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
|---|---|---|
| committer | Chris Metcalf <cmetcalf@tilera.com> | 2010-07-06 19:45:24 +0200 |
| commit | a2262d8a231e92742651859a10c9a4430a5e899a (patch) | |
| tree | b5a823e3f6a3f60e1dd995f113caf0b350228d84 /security/keys | |
| parent | arch/tile: catch up on various minor cleanups. (diff) | |
| parent | Linux 2.6.35-rc4 (diff) | |
| download | linux-a2262d8a231e92742651859a10c9a4430a5e899a.tar.xz linux-a2262d8a231e92742651859a10c9a4430a5e899a.zip | |
Merge branch 'master' into for-linus
Diffstat (limited to 'security/keys')
| -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, 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 @@ set: return old_setting; error: abort_creds(new); - return -EINVAL; + return ret; } /* end keyctl_set_reqkey_keyring() */ |