summaryrefslogtreecommitdiffstats
path: root/crypto
diff options
context:
space:
mode:
authorDan Carpenter <dan.carpenter@oracle.com>2017-06-08 14:47:49 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-04-13 19:48:25 +0200
commit4b8fd8db48be40261cb1eafb8a9605a2e4d37091 (patch)
treef56e90102b1b131f82f630a73a3b977ccfef3c25 /crypto
parent45be9b7771600c650acfdcc8501999df8751f695 (diff)
downloadlinux-stable-4b8fd8db48be40261cb1eafb8a9605a2e4d37091.tar.gz
linux-stable-4b8fd8db48be40261cb1eafb8a9605a2e4d37091.tar.bz2
linux-stable-4b8fd8db48be40261cb1eafb8a9605a2e4d37091.zip
X.509: Fix error code in x509_cert_parse()
[ Upstream commit 4e880168e9ffb1cdbdb72b3b48ab0324b30c2d62 ] We forgot to set the error code on this path so it could result in returning NULL which leads to a NULL dereference. Fixes: db6c43bd2132 ("crypto: KEYS: convert public key and digsig asym to the akcipher api") Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: James Morris <james.l.morris@oracle.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'crypto')
-rw-r--r--crypto/asymmetric_keys/x509_cert_parser.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index 029f7051f2be..ce2df8c9c583 100644
--- a/crypto/asymmetric_keys/x509_cert_parser.c
+++ b/crypto/asymmetric_keys/x509_cert_parser.c
@@ -102,6 +102,7 @@ struct x509_certificate *x509_cert_parse(const void *data, size_t datalen)
}
}
+ ret = -ENOMEM;
cert->pub->key = kmemdup(ctx->key, ctx->key_size, GFP_KERNEL);
if (!cert->pub->key)
goto error_decode;