summaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2013-10-30 04:23:02 +0100
committerDavid Howells <dhowells@redhat.com>2013-10-30 13:54:29 +0100
commitd2b86970245b64652c4d7799e707dd8bd1533b64 (patch)
tree00aaa63cb66c5cfbd595261ba7f5029fbe1326f9 /security
parentKEYS: Fix keyring quota misaccounting on key replacement and unlink (diff)
downloadlinux-d2b86970245b64652c4d7799e707dd8bd1533b64.tar.xz
linux-d2b86970245b64652c4d7799e707dd8bd1533b64.zip
KEYS: fix error return code in big_key_instantiate()
Fix to return a negative error code from the error handling case instead of 0, as done elsewhere in this function. Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'security')
-rw-r--r--security/keys/big_key.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/keys/big_key.c b/security/keys/big_key.c
index 5f9defc4a807..2cf5e62d67af 100644
--- a/security/keys/big_key.c
+++ b/security/keys/big_key.c
@@ -71,8 +71,10 @@ int big_key_instantiate(struct key *key, struct key_preparsed_payload *prep)
* TODO: Encrypt the stored data with a temporary key.
*/
file = shmem_file_setup("", datalen, 0);
- if (IS_ERR(file))
+ if (IS_ERR(file)) {
+ ret = PTR_ERR(file);
goto err_quota;
+ }
written = kernel_write(file, prep->data, prep->datalen, 0);
if (written != datalen) {