Commit 015c44d7 authored by Thomas Bartschies's avatar Thomas Bartschies Committed by Steffen Klassert
Browse files

net: af_key: check encryption module availability consistency 



Since the recent introduction supporting the SM3 and SM4 hash algos for IPsec, the kernel
produces invalid pfkey acquire messages, when these encryption modules are disabled. This
happens because the availability of the algos wasn't checked in all necessary functions.
This patch adds these checks.

Signed-off-by: default avatarThomas Bartschies <thomas.bartschies@cvk.de>
Signed-off-by: default avatarSteffen Klassert <steffen.klassert@secunet.com>
parent 4dc2a5a8

net/key/af_key.c

+3 −3
Original line number Diff line number Diff line
@@ -2900,7 +2900,7 @@ static int count_ah_combs(const struct xfrm_tmpl *t) 
			break;

		if (!aalg->pfkey_supported)

			continue;

		if (aalg_tmpl_set(t, aalg))

		if (aalg_tmpl_set(t, aalg) && aalg->available)

			sz += sizeof(struct sadb_comb);

	}

	return sz + sizeof(struct sadb_prop);
@@ -2918,7 +2918,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t) 
		if (!ealg->pfkey_supported)

			continue;



		if (!(ealg_tmpl_set(t, ealg)))

		if (!(ealg_tmpl_set(t, ealg) && ealg->available))

			continue;



		for (k = 1; ; k++) {
@@ -2929,7 +2929,7 @@ static int count_esp_combs(const struct xfrm_tmpl *t) 
			if (!aalg->pfkey_supported)

				continue;



			if (aalg_tmpl_set(t, aalg))

			if (aalg_tmpl_set(t, aalg) && aalg->available)

				sz += sizeof(struct sadb_comb);

		}

	}