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

Commit a652c30f authored by Robbie Harwood's avatar Robbie Harwood Committed by Greg Kroah-Hartman
Browse files

asymmetric_keys: log on fatal failures in PE/pkcs7 



[ Upstream commit 3584c1dbfffdabf8e3dc1dd25748bb38dd01cd43 ]

These particular errors can be encountered while trying to kexec when
secureboot lockdown is in place.  Without this change, even with a
signed debug build, one still needs to reboot the machine to add the
appropriate dyndbg parameters (since lockdown blocks debugfs).

Accordingly, upgrade all pr_debug() before fatal error into pr_warn().

Signed-off-by: default avatarRobbie Harwood <rharwood@redhat.com>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Jarkko Sakkinen <jarkko@kernel.org>
cc: Eric Biederman <ebiederm@xmission.com>
cc: Herbert Xu <herbert@gondor.apana.org.au>
cc: keyrings@vger.kernel.org
cc: linux-crypto@vger.kernel.org
cc: kexec@lists.infradead.org
Link: https://lore.kernel.org/r/20230220171254.592347-3-rharwood@redhat.com/

 # v2
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 5809dbac

crypto/asymmetric_keys/pkcs7_verify.c

+5 −5
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, 
		}



		if (sinfo->msgdigest_len != sig->digest_size) {

			pr_debug("Sig %u: Invalid digest size (%u)\n",

			pr_warn("Sig %u: Invalid digest size (%u)\n",

				sinfo->index, sinfo->msgdigest_len);

			ret = -EBADMSG;

			goto error;
@@ -87,7 +87,7 @@ static int pkcs7_digest(struct pkcs7_message *pkcs7, 


		if (memcmp(sig->digest, sinfo->msgdigest,

			   sinfo->msgdigest_len) != 0) {

			pr_debug("Sig %u: Message digest doesn't match\n",

			pr_warn("Sig %u: Message digest doesn't match\n",

				sinfo->index);

			ret = -EKEYREJECTED;

			goto error;
@@ -488,7 +488,7 @@ int pkcs7_supply_detached_data(struct pkcs7_message *pkcs7, 
			       const void *data, size_t datalen)

{

	if (pkcs7->data) {

		pr_debug("Data already supplied\n");

		pr_warn("Data already supplied\n");

		return -EINVAL;

	}

	pkcs7->data = data;

crypto/asymmetric_keys/verify_pefile.c

+12 −12
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen, 
		break;



	default:

		pr_debug("Unknown PEOPT magic = %04hx\n", pe32->magic);

		pr_warn("Unknown PEOPT magic = %04hx\n", pe32->magic);

		return -ELIBBAD;

	}
@@ -95,7 +95,7 @@ static int pefile_parse_binary(const void *pebuf, unsigned int pelen, 
	ctx->certs_size = ddir->certs.size;



	if (!ddir->certs.virtual_address || !ddir->certs.size) {

		pr_debug("Unsigned PE binary\n");

		pr_warn("Unsigned PE binary\n");

		return -ENODATA;

	}
@@ -127,7 +127,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, 
	unsigned len;



	if (ctx->sig_len < sizeof(wrapper)) {

		pr_debug("Signature wrapper too short\n");

		pr_warn("Signature wrapper too short\n");

		return -ELIBBAD;

	}
@@ -142,16 +142,16 @@ static int pefile_strip_sig_wrapper(const void *pebuf, 
	 * rounded up since 0.110.

	 */

	if (wrapper.length > ctx->sig_len) {

		pr_debug("Signature wrapper bigger than sig len (%x > %x)\n",

		pr_warn("Signature wrapper bigger than sig len (%x > %x)\n",

			ctx->sig_len, wrapper.length);

		return -ELIBBAD;

	}

	if (wrapper.revision != WIN_CERT_REVISION_2_0) {

		pr_debug("Signature is not revision 2.0\n");

		pr_warn("Signature is not revision 2.0\n");

		return -ENOTSUPP;

	}

	if (wrapper.cert_type != WIN_CERT_TYPE_PKCS_SIGNED_DATA) {

		pr_debug("Signature certificate type is not PKCS\n");

		pr_warn("Signature certificate type is not PKCS\n");

		return -ENOTSUPP;

	}
@@ -164,7 +164,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, 
	ctx->sig_offset += sizeof(wrapper);

	ctx->sig_len -= sizeof(wrapper);

	if (ctx->sig_len < 4) {

		pr_debug("Signature data missing\n");

		pr_warn("Signature data missing\n");

		return -EKEYREJECTED;

	}
@@ -198,7 +198,7 @@ static int pefile_strip_sig_wrapper(const void *pebuf, 
		return 0;

	}

not_pkcs7:

	pr_debug("Signature data not PKCS#7\n");

	pr_warn("Signature data not PKCS#7\n");

	return -ELIBBAD;

}
@@ -341,7 +341,7 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen, 
	digest_size = crypto_shash_digestsize(tfm);



	if (digest_size != ctx->digest_len) {

		pr_debug("Digest size mismatch (%zx != %x)\n",

		pr_warn("Digest size mismatch (%zx != %x)\n",

			digest_size, ctx->digest_len);

		ret = -EBADMSG;

		goto error_no_desc;
@@ -373,7 +373,7 @@ static int pefile_digest_pe(const void *pebuf, unsigned int pelen, 
	 * PKCS#7 certificate.

	 */

	if (memcmp(digest, ctx->digest, ctx->digest_len) != 0) {

		pr_debug("Digest mismatch\n");

		pr_warn("Digest mismatch\n");

		ret = -EKEYREJECTED;

	} else {

		pr_debug("The digests match!\n");