diff options
| author | Ziyang Xuan <william.xuanziyang@huawei.com> | 2022-03-19 11:14:33 +0800 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-03-21 14:58:13 -0700 |
| commit | 1ddcbfbf9dc9b59258dc5a4429f607a6828863d0 (patch) | |
| tree | f52a033fbdfc76f28321a102fed876780ed2d351 /net/tls | |
| parent | 351bdbb6419ca988802882badadc321d384d0254 (diff) | |
| download | linux-stable-1ddcbfbf9dc9b59258dc5a4429f607a6828863d0.tar.gz linux-stable-1ddcbfbf9dc9b59258dc5a4429f607a6828863d0.tar.bz2 linux-stable-1ddcbfbf9dc9b59258dc5a4429f607a6828863d0.zip | |
net/tls: remove unnecessary jump instructions in do_tls_setsockopt_conf()
Avoid using "goto" jump instruction unconditionally when we
can return directly. Remove unnecessary jump instructions in
do_tls_setsockopt_conf().
Signed-off-by: Ziyang Xuan <william.xuanziyang@huawei.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Diffstat (limited to 'net/tls')
| -rw-r--r-- | net/tls/tls_main.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/net/tls/tls_main.c b/net/tls/tls_main.c index 6bc2879ba637..7b2b0e7ffee4 100644 --- a/net/tls/tls_main.c +++ b/net/tls/tls_main.c @@ -553,10 +553,8 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval, int rc = 0; int conf; - if (sockptr_is_null(optval) || (optlen < sizeof(*crypto_info))) { - rc = -EINVAL; - goto out; - } + if (sockptr_is_null(optval) || (optlen < sizeof(*crypto_info))) + return -EINVAL; if (tx) { crypto_info = &ctx->crypto_send.info; @@ -567,10 +565,8 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval, } /* Currently we don't support set crypto info more than one time */ - if (TLS_CRYPTO_INFO_READY(crypto_info)) { - rc = -EBUSY; - goto out; - } + if (TLS_CRYPTO_INFO_READY(crypto_info)) + return -EBUSY; rc = copy_from_sockptr(crypto_info, optval, sizeof(*crypto_info)); if (rc) { @@ -672,11 +668,10 @@ static int do_tls_setsockopt_conf(struct sock *sk, sockptr_t optval, ctx->sk_write_space = sk->sk_write_space; sk->sk_write_space = tls_write_space; } - goto out; + return 0; err_crypto_info: memzero_explicit(crypto_info, sizeof(union tls_crypto_context)); -out: return rc; } |