[2/6] crypto/af_alg01: new regression test for hmac nesting bug

Commit Message

Eric Biggers Feb. 21, 2019, 5:30 a.m. UTC

From: Eric Biggers <[e-mail]>

Signed-off-by: Eric Biggers <[e-mail]>
---
 runtest/cve                        |  1 +
 testcases/kernel/crypto/.gitignore |  1 +
 testcases/kernel/crypto/af_alg01.c | 79 ++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 testcases/kernel/crypto/af_alg01.c

Comments

Petr Vorel March 15, 2019, 9:43 a.m. UTC | #1

Hi Eric,

> +static void run(void)
> +{
> +	/* try several different unkeyed hash algorithms */
> +	static const char * const hash_algs[] = {
> +		"md5", "md5-generic",
> +		"sha1", "sha1-generic",
> +		"sha224", "sha224-generic",
> +		"sha256", "sha256-generic",
> +		"sha3-256", "sha3-256-generic",
> +		"sha3-512", "sha3-512-generic",
> +	};
> +	size_t i;
FYI: We usually use struct tcase with .tcnt = ARRAY_SIZE(tcases)
instead of for loop, but it's only a minor detail.

> +
> +	for (i = 0; i < ARRAY_SIZE(hash_algs); i++)
> +		test_with_hash_alg(hash_algs[i]);
> +}
> +
> +static struct tst_test test = {
> +	.test_all = run,
> +};


Kind regards,
Petr

Patch

diff --git a/runtest/cve b/runtest/cve
index 8f38045e9a..f46c400cc4 100644
--- a/runtest/cve
+++ b/runtest/cve
@@ -27,6 +27,7 @@  cve-2017-15299 request_key03 -b cve-2017-15299
 cve-2017-15537 ptrace07
 cve-2017-15649 fanout01
 cve-2017-15951 request_key03 -b cve-2017-15951
+cve-2017-17806 af_alg01
 cve-2017-17807 request_key04
 cve-2017-1000364 stack_clash
 cve-2017-5754 meltdown
diff --git a/testcases/kernel/crypto/.gitignore b/testcases/kernel/crypto/.gitignore
index 759592fbdf..998af17284 100644
--- a/testcases/kernel/crypto/.gitignore
+++ b/testcases/kernel/crypto/.gitignore
@@ -1,2 +1,3 @@ 
+af_alg01
 pcrypt_aead01
 crypto_user01
diff --git a/testcases/kernel/crypto/af_alg01.c b/testcases/kernel/crypto/af_alg01.c
new file mode 100644
index 0000000000..79b61de279
--- /dev/null
+++ b/testcases/kernel/crypto/af_alg01.c
@@ -0,0 +1,79 @@ 
+// SPDX-License-Identifier: GPL-2.0-or-later
+/*
+ * Copyright 2019 Google LLC
+ */
+
+/*
+ * Regression test for commit af3ff8045bbf ("crypto: hmac - require that the
+ * underlying hash algorithm is unkeyed"), or CVE-2017-17806.  This test
+ * verifies that the hmac template cannot be nested inside itself.
+ */
+
+#include <errno.h>
+#include <stdio.h>
+
+#include "tst_test.h"
+#include "tst_af_alg.h"
+
+static void test_with_hash_alg(const char *hash_algname)
+{
+	char hmac_algname[64];
+	char key[4096] = { 0 };
+
+	if (!tst_have_alg("hash", hash_algname)) {
+		tst_res(TCONF, "kernel doesn't have hash algorithm '%s'",
+			hash_algname);
+		return;
+	}
+	sprintf(hmac_algname, "hmac(%s)", hash_algname);
+	if (!tst_have_alg("hash", hmac_algname)) {
+		tst_res(TCONF, "kernel doesn't have hash algorithm '%s'",
+			hmac_algname);
+		return;
+	}
+
+	sprintf(hmac_algname, "hmac(hmac(%s))", hash_algname);
+	if (tst_have_alg("hash", hmac_algname)) {
+		int algfd;
+
+		tst_res(TFAIL, "instantiated nested hmac algorithm ('%s')!",
+			hmac_algname);
+
+		/*
+		 * Be extra annoying; with the bug, setting a key on
+		 * "hmac(hmac(sha3-256-generic))" crashed the kernel.
+		 */
+		algfd = tst_alg_setup("hash", hmac_algname, NULL, 0);
+		if (setsockopt(algfd, SOL_ALG, ALG_SET_KEY,
+			       key, sizeof(key)) == 0) {
+			tst_res(TFAIL,
+				"set key on nested hmac algorithm ('%s')!",
+				hmac_algname);
+		}
+	} else {
+		tst_res(TPASS,
+			"couldn't instantiate nested hmac algorithm ('%s')",
+			hmac_algname);
+	}
+}
+
+static void run(void)
+{
+	/* try several different unkeyed hash algorithms */
+	static const char * const hash_algs[] = {
+		"md5", "md5-generic",
+		"sha1", "sha1-generic",
+		"sha224", "sha224-generic",
+		"sha256", "sha256-generic",
+		"sha3-256", "sha3-256-generic",
+		"sha3-512", "sha3-512-generic",
+	};
+	size_t i;
+
+	for (i = 0; i < ARRAY_SIZE(hash_algs); i++)
+		test_with_hash_alg(hash_algs[i]);
+}
+
+static struct tst_test test = {
+	.test_all = run,
+};