summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Biggers <ebiggers@google.com>2017-12-08 15:13:28 +0000
committerDavid Howells <dhowells@redhat.com>2017-12-08 15:13:28 +0000
commit7204eb8590c750e8c10b47f4acd4efe6e4138452 (patch)
treeb6e67acf18994b248f57d71d03dc872e9557a93a
parent8ecb506d3476aa58077e79ef1f75395625458fcc (diff)
downloadop-kernel-dev-7204eb8590c750e8c10b47f4acd4efe6e4138452.zip
op-kernel-dev-7204eb8590c750e8c10b47f4acd4efe6e4138452.tar.gz
pkcs7: fix check for self-signed certificate
pkcs7_validate_trust_one() used 'x509->next == x509' to identify a self-signed certificate. That's wrong; ->next is simply the link in the linked list of certificates in the PKCS#7 message. It should be checking ->signer instead. Fix it. Fortunately this didn't actually matter because when we re-visited 'x509' on the next iteration via 'x509->signer', it was already seen and not verified, so we returned -ENOKEY anyway. Signed-off-by: Eric Biggers <ebiggers@google.com> Signed-off-by: David Howells <dhowells@redhat.com> Reviewed-by: James Morris <james.l.morris@oracle.com>
-rw-r--r--crypto/asymmetric_keys/pkcs7_trust.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/asymmetric_keys/pkcs7_trust.c b/crypto/asymmetric_keys/pkcs7_trust.c
index f6a009d..1f4e25f 100644
--- a/crypto/asymmetric_keys/pkcs7_trust.c
+++ b/crypto/asymmetric_keys/pkcs7_trust.c
@@ -69,7 +69,7 @@ static int pkcs7_validate_trust_one(struct pkcs7_message *pkcs7,
/* Self-signed certificates form roots of their own, and if we
* don't know them, then we can't accept them.
*/
- if (x509->next == x509) {
+ if (x509->signer == x509) {
kleave(" = -ENOKEY [unknown self-signed]");
return -ENOKEY;
}
OpenPOWER on IntegriCloud