Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ded3bec authored by James Morris's avatar James Morris
Browse files

Merge tag 'keys-fixes-20171208' of... 

Merge tag 'keys-fixes-20171208' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs into keys-for-linus

Assorted fixes for keyrings, ASN.1, X.509 and PKCS#7.
parents f335195a 54c1fb39

crypto/asymmetric_keys/pkcs7_parser.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -148,8 +148,10 @@ struct pkcs7_message *pkcs7_parse_message(const void *data, size_t datalen) 
	}

	}





	ret = pkcs7_check_authattrs(ctx->msg);

	ret = pkcs7_check_authattrs(ctx->msg);

	if (ret < 0)

	if (ret < 0) {

		msg = ERR_PTR(ret);

		goto out;

		goto out;

	}





	msg = ctx->msg;

	msg = ctx->msg;

	ctx->msg = NULL;

	ctx->msg = NULL;

crypto/asymmetric_keys/pkcs7_trust.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

		 /* Self-signed certificates form roots of their own, and if we

		  * don't know them, then we can't accept them.

		  * don't know them, then we can't accept them.

		  */

		  */

		if (x509->next == x509) {

		if (x509->signer == x509) {

			kleave(" = -ENOKEY [unknown self-signed]");

			kleave(" = -ENOKEY [unknown self-signed]");

			return -ENOKEY;

			return -ENOKEY;

		}

		}

crypto/asymmetric_keys/pkcs7_verify.c

+3 −6
Original line number Original line Diff line number Diff line
@@ -59,10 +59,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, 
	desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;

	desc->flags = CRYPTO_TFM_REQ_MAY_SLEEP;





	/* Digest the message [RFC2315 9.3] */

	/* Digest the message [RFC2315 9.3] */

	ret = crypto_shash_init(desc);

	ret = crypto_shash_digest(desc, pkcs7->data, pkcs7->data_len,

	if (ret < 0)

		goto error;

	ret = crypto_shash_finup(desc, pkcs7->data, pkcs7->data_len,

				  sig->digest);

				  sig->digest);

	if (ret < 0)

	if (ret < 0)

		goto error;

		goto error;
@@ -150,7 +147,7 @@ static int pkcs7_find_key(struct pkcs7_message *pkcs7, 
		pr_devel("Sig %u: Found cert serial match X.509[%u]\n",

		pr_devel("Sig %u: Found cert serial match X.509[%u]\n",

			 sinfo->index, certix);

			 sinfo->index, certix);





		if (x509->pub->pkey_algo != sinfo->sig->pkey_algo) {

		if (strcmp(x509->pub->pkey_algo, sinfo->sig->pkey_algo) != 0) {

			pr_warn("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n",

			pr_warn("Sig %u: X.509 algo and PKCS#7 sig algo don't match\n",

				sinfo->index);

				sinfo->index);

			continue;

			continue;

crypto/asymmetric_keys/public_key.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ int public_key_verify_signature(const struct public_key *pkey, 
	char alg_name_buf[CRYPTO_MAX_ALG_NAME];

	char alg_name_buf[CRYPTO_MAX_ALG_NAME];

	void *output;

	void *output;

	unsigned int outlen;

	unsigned int outlen;

	int ret = -ENOMEM;

	int ret;





	pr_devel("==>%s()\n", __func__);

	pr_devel("==>%s()\n", __func__);
@@ -99,6 +99,7 @@ int public_key_verify_signature(const struct public_key *pkey, 
	if (IS_ERR(tfm))

	if (IS_ERR(tfm))

		return PTR_ERR(tfm);

		return PTR_ERR(tfm);





	ret = -ENOMEM;

	req = akcipher_request_alloc(tfm, GFP_KERNEL);

	req = akcipher_request_alloc(tfm, GFP_KERNEL);

	if (!req)

	if (!req)

		goto error_free_tfm;

		goto error_free_tfm;
@@ -127,7 +128,7 @@ int public_key_verify_signature(const struct public_key *pkey, 
	 * signature and returns that to us.

	 * signature and returns that to us.

	 */

	 */

	ret = crypto_wait_req(crypto_akcipher_verify(req), &cwait);

	ret = crypto_wait_req(crypto_akcipher_verify(req), &cwait);

	if (ret < 0)

	if (ret)

		goto out_free_output;

		goto out_free_output;





	/* Do the actual verification step. */

	/* Do the actual verification step. */
@@ -142,6 +143,8 @@ int public_key_verify_signature(const struct public_key *pkey, 
error_free_tfm:

error_free_tfm:

	crypto_free_akcipher(tfm);

	crypto_free_akcipher(tfm);

	pr_devel("<==%s() = %d\n", __func__, ret);

	pr_devel("<==%s() = %d\n", __func__, ret);

	if (WARN_ON_ONCE(ret > 0))

		ret = -EINVAL;

	return ret;

	return ret;

}

}

EXPORT_SYMBOL_GPL(public_key_verify_signature);

EXPORT_SYMBOL_GPL(public_key_verify_signature);

crypto/asymmetric_keys/x509_cert_parser.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -409,6 +409,8 @@ int x509_extract_key_data(void *context, size_t hdrlen, 
	ctx->cert->pub->pkey_algo = "rsa";

	ctx->cert->pub->pkey_algo = "rsa";





	/* Discard the BIT STRING metadata */

	/* Discard the BIT STRING metadata */

	if (vlen < 1 || *(const u8 *)value != 0)

		return -EBADMSG;

	ctx->key = value + 1;

	ctx->key = value + 1;

	ctx->key_size = vlen - 1;

	ctx->key_size = vlen - 1;

	return 0;

	return 0;