summaryrefslogtreecommitdiffstats
path: root/net/tls/tls_main.c
diff options
context:
space:
mode:
authorSabrina Dubroca <sd@queasysnail.net>2018-01-16 16:04:27 +0100
committerDavid S. Miller <davem@davemloft.net>2018-01-17 16:16:03 -0500
commit877d17c79b66466942a836403773276e34fe3614 (patch)
treeb7fb010cc3eaa414f8518048a1d3e2ba107ec5ac /net/tls/tls_main.c
parentcf6d43ef66f416282121f436ce1bee9a25199d52 (diff)
downloadlinux-877d17c79b66466942a836403773276e34fe3614.tar.gz
linux-877d17c79b66466942a836403773276e34fe3614.tar.bz2
linux-877d17c79b66466942a836403773276e34fe3614.zip
tls: return -EBUSY if crypto_info is already set
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>
Diffstat (limited to 'net/tls/tls_main.c')
-rw-r--r--net/tls/tls_main.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c
index 7b7a70e22d90..8e9cbfd21423 100644
--- a/net/tls/tls_main.c
+++ b/net/tls/tls_main.c
@@ -367,8 +367,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;
+ }
rc = copy_from_user(crypto_info, optval, sizeof(*crypto_info));
if (rc) {