Commit 2f54941c authored Jan 16, 2018 by Sabrina Dubroca Committed by Greg Kroah-Hartman Jan 31, 2018

tls: return -EBUSY if crypto_info is already set




[ Upstream commit 877d17c79b66466942a836403773276e34fe3614 ]

do_tls_setsockopt_tx returns 0 without doing anything when crypto_info
is already set. Silent failure is confusing for users.

Fixes: 3c4d7559 ("tls: kernel TLS support")
Signed-off-by: Sabrina Dubroca <sd@queasysnail.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 3a28f04b

net/tls/tls_main.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -364,8 +364,10 @@ static int do_tls_setsockopt_tx(struct sock sk, char __user optval,
		crypto_info = &ctx->crypto_send;

		/* Currently we don't support set crypto info more than one time */
		if (TLS_CRYPTO_INFO_READY(crypto_info))
		if (TLS_CRYPTO_INFO_READY(crypto_info)) {
		rc = -EBUSY;
		goto out;
		}

		switch (tmp_crypto_info.cipher_type) {
		case TLS_CIPHER_AES_GCM_128: {