From: Ben Hutchings <ben@decadent.org.uk>
Date: Sun, 5 May 2019 12:45:06 +0000 (+0100)
Subject: MODSIGN: Make shash allocation failure fatal
X-Git-Tag: archive/raspbian/5.9.6-1+rpi1^2~20
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=fc500d87a387bc1ac762bba4521b1109591b734b;p=linux.git

MODSIGN: Make shash allocation failure fatal

mod_is_hash_blacklisted() currently returns 0 (suceess) if
crypto_alloc_shash() fails.  This should instead be a fatal error,
so unwrap and pass up the error code.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

Gbp-Pq: Topic features/all/db-mok-keyring
Gbp-Pq: Name modsign-make-shash-allocation-failure-fatal.patch
---

diff --git a/kernel/module_signing.c b/kernel/module_signing.c
index 0f041a21f41..5d800f1564b 100644
--- a/kernel/module_signing.c
+++ b/kernel/module_signing.c
@@ -22,11 +22,13 @@ static int mod_is_hash_blacklisted(const void *mod, size_t verifylen)
 	struct shash_desc *desc;
 	size_t digest_size, desc_size;
 	u8 *digest;
-	int ret = 0;
+	int ret;
 
 	tfm = crypto_alloc_shash("sha256", 0, 0);
-	if (IS_ERR(tfm))
+	if (IS_ERR(tfm)) {
+		ret = PTR_ERR(tfm);
 		goto error_return;
+	}
 
 	desc_size = crypto_shash_descsize(tfm) + sizeof(*desc);
 	digest_size = crypto_shash_digestsize(tfm);