diff options
| author | Sabrina Dubroca <sd@queasysnail.net> | 2018-01-16 16:04:27 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-01-31 14:03:48 +0100 |
| commit | 2f54941c886c9f4d788ab0d4a81830a177ab7fd1 (patch) | |
| tree | 184b1b425743de8ddf9e34d9f2132de9c424135a | |
| parent | 3a28f04bc4c20e56d75327165f2922a525225b7c (diff) | |
| download | linux-stable-2f54941c886c9f4d788ab0d4a81830a177ab7fd1.tar.gz linux-stable-2f54941c886c9f4d788ab0d4a81830a177ab7fd1.tar.bz2 linux-stable-2f54941c886c9f4d788ab0d4a81830a177ab7fd1.zip | |
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: 3c4d7559159b ("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>
| -rw-r--r-- | net/tls/tls_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 70757098f79b..06688edb6855 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -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: { |