Commit 5f309ade authored by Sabrina Dubroca's avatar Sabrina Dubroca Committed by Jakub Kicinski
Browse files

tls: get crypto_info size from tls_cipher_desc in do_tls_setsockopt_conf 



We can simplify do_tls_setsockopt_conf using tls_cipher_desc. Also use
get_cipher_desc's result to check if the cipher_type coming from
userspace is valid.

Signed-off-by: default avatarSabrina Dubroca <sd@queasysnail.net>
Link: https://lore.kernel.org/r/e97658eb4c6a5832f8ba20a06c4f36a77763c59e.1692977948.git.sd@queasysnail.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e907277a

net/tls/tls_main.c

+8 −31
Original line number Diff line number Diff line
@@ -739,7 +739,7 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval, 
	struct tls_crypto_info *crypto_info;

	struct tls_crypto_info *alt_crypto_info;

	struct tls_context *ctx = tls_get_ctx(sk);

	size_t optsize;

	const struct tls_cipher_desc *cipher_desc;

	int rc = 0;

	int conf;
@@ -780,46 +780,23 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval, 
		}

	}



	switch (crypto_info->cipher_type) {

	case TLS_CIPHER_AES_GCM_128:

		optsize = sizeof(struct tls12_crypto_info_aes_gcm_128);

		break;

	case TLS_CIPHER_AES_GCM_256: {

		optsize = sizeof(struct tls12_crypto_info_aes_gcm_256);

		break;

	}

	case TLS_CIPHER_AES_CCM_128:

		optsize = sizeof(struct tls12_crypto_info_aes_ccm_128);

		break;

	case TLS_CIPHER_CHACHA20_POLY1305:

		optsize = sizeof(struct tls12_crypto_info_chacha20_poly1305);

		break;

	case TLS_CIPHER_SM4_GCM:

		optsize = sizeof(struct tls12_crypto_info_sm4_gcm);

		break;

	case TLS_CIPHER_SM4_CCM:

		optsize = sizeof(struct tls12_crypto_info_sm4_ccm);

		break;

	case TLS_CIPHER_ARIA_GCM_128:

		if (crypto_info->version != TLS_1_2_VERSION) {

	cipher_desc = get_cipher_desc(crypto_info->cipher_type);

	if (!cipher_desc) {

		rc = -EINVAL;

		goto err_crypto_info;

	}

		optsize = sizeof(struct tls12_crypto_info_aria_gcm_128);

		break;



	switch (crypto_info->cipher_type) {

	case TLS_CIPHER_ARIA_GCM_128:

	case TLS_CIPHER_ARIA_GCM_256:

		if (crypto_info->version != TLS_1_2_VERSION) {

			rc = -EINVAL;

			goto err_crypto_info;

		}

		optsize = sizeof(struct tls12_crypto_info_aria_gcm_256);

		break;

	default:

		rc = -EINVAL;

		goto err_crypto_info;

	}



	if (optlen != optsize) {

	if (optlen != cipher_desc->crypto_info) {

		rc = -EINVAL;

		goto err_crypto_info;

	}