| From foo@baz Mon Apr 9 17:09:24 CEST 2018 |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| Date: Thu, 8 Jun 2017 14:47:49 +0100 |
| Subject: X.509: Fix error code in x509_cert_parse() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| |
| [ 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> |
| --- |
| crypto/asymmetric_keys/x509_cert_parser.c | 1 + |
| 1 file changed, 1 insertion(+) |
| |
| --- 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 |
| } |
| } |
| |
| + ret = -ENOMEM; |
| cert->pub->key = kmemdup(ctx->key, ctx->key_size, GFP_KERNEL); |
| if (!cert->pub->key) |
| goto error_decode; |
