git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
fsnotify: store struct file not struct path
[sfrench/cifs-2.6.git]
/
security
/
keys
/
keyctl.c
diff --git
a/security/keys/keyctl.c
b/security/keys/keyctl.c
index 13074b4547433ab20929fa493114b507c9e4389f..6261745e44591acd65bb47e18e9f65b9e842bfe5 100644
(file)
--- 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() */