[PATCH 04/23] X.509: Fix error code in x509_cert_parse()

From	David Howells <dhowells@redhat.com>
Newsgroups	linux.kernel
Subject	[PATCH 04/23] X.509: Fix error code in x509_cert_parse()
Date	2017-06-08 15:50 +0200
Message-ID	<tQ5Z3-4WL-77@gated-at.bofh.it> (permalink)
References	<tQ5Z0-4WL-11@gated-at.bofh.it>
Organization	Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903

Show all headers | View raw

From: Dan Carpenter <dan.carpenter@oracle.com>

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>
---

 crypto/asymmetric_keys/x509_cert_parser.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/asymmetric_keys/x509_cert_parser.c b/crypto/asymmetric_keys/x509_cert_parser.c
index c80765b211cf..dd03fead1ca3 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;

Thread

[PATCH 00/23] KEYS: Fixes David Howells <dhowells@redhat.com> - 2017-06-08 15:50 +0200
  [PATCH 05/23] KEYS: Delete an error message for a failed memory  allocation in get_derived_key() David Howells <dhowells@redhat.com> - 2017-06-08 15:50 +0200
  [PATCH 18/23] KEYS: DH: forbid using digest_null as the KDF hash David Howells <dhowells@redhat.com> - 2017-06-08 15:50 +0200
  [PATCH 10/23] KEYS: encrypted: use constant-time HMAC comparison David Howells <dhowells@redhat.com> - 2017-06-08 15:50 +0200
  [PATCH 04/23] X.509: Fix error code in x509_cert_parse() David Howells <dhowells@redhat.com> - 2017-06-08 15:50 +0200
  [PATCH 07/23] KEYS: encrypted: avoid encrypting/decrypting stack  buffers David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 20/23] KEYS: DH: ensure the KDF counter is properly aligned David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 19/23] KEYS: DH: don't feed uninitialized "otherinfo" into  KDF David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 16/23] KEYS: trusted: sanitize all key material David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 21/23] KEYS: DH: add __user annotations to keyctl_kdf_params David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 13/23] KEYS: sanitize add_key() and keyctl() key payloads David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 14/23] KEYS: user_defined: sanitize key payloads David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 22/23] crypto : asymmetric_keys : verify_pefile:zero memory  content before freeing David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 23/23] KEYS: Convert KEYCTL_DH_COMPUTE to use the crypto KPP  API David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 11/23] KEYS: fix dereferencing NULL payload with nonzero  length David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 09/23] KEYS: encrypted: fix race causing incorrect HMAC  calculations David Howells <dhowells@redhat.com> - 2017-06-08 16:00 +0200
  [PATCH 08/23] KEYS: encrypted: fix buffer overread in  valid_master_desc() David Howells <dhowells@redhat.com> - 2017-06-08 16:10 +0200
  [PATCH 02/23] security: use READ_ONCE instead of deprecated  ACCESS_ONCE David Howells <dhowells@redhat.com> - 2017-06-08 16:10 +0200
  Re: [PATCH 00/23] KEYS: Fixes James Morris <jmorris@namei.org> - 2017-06-08 16:40 +0200
    Re: [PATCH 00/23] KEYS: Fixes David Howells <dhowells@redhat.com> - 2017-06-08 16:50 +0200

csiph-web