diff options
author | Vakul Garg <vakul.garg@nxp.com> | 2018-07-24 07:24:27 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2018-07-26 17:01:55 -0400 |
commit | 201876b33c09edcb6c2914f0ced798437a102648 (patch) | |
tree | 9787699d93660c7b25bc3656c6b6c85584bbc47b | |
parent | 990e35ecba1cb8ebee4ad4a028735e24f4615417 (diff) |
net/tls: Removed redundant checks for non-NULL
Removed checks against non-NULL before calling kfree_skb() and
crypto_free_aead(). These functions are safe to be called with NULL
as an argument.
Signed-off-by: Vakul Garg <vakul.garg@nxp.com>
Acked-by: Dave Watson <davejwatson@fb.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | net/tls/tls_sw.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 03f1370f5db1..0687a7a4689f 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c | |||
@@ -1047,8 +1047,7 @@ void tls_sw_free_resources_tx(struct sock *sk) | |||
1047 | struct tls_context *tls_ctx = tls_get_ctx(sk); | 1047 | struct tls_context *tls_ctx = tls_get_ctx(sk); |
1048 | struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx); | 1048 | struct tls_sw_context_tx *ctx = tls_sw_ctx_tx(tls_ctx); |
1049 | 1049 | ||
1050 | if (ctx->aead_send) | 1050 | crypto_free_aead(ctx->aead_send); |
1051 | crypto_free_aead(ctx->aead_send); | ||
1052 | tls_free_both_sg(sk); | 1051 | tls_free_both_sg(sk); |
1053 | 1052 | ||
1054 | kfree(ctx); | 1053 | kfree(ctx); |
@@ -1060,10 +1059,8 @@ void tls_sw_release_resources_rx(struct sock *sk) | |||
1060 | struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx); | 1059 | struct tls_sw_context_rx *ctx = tls_sw_ctx_rx(tls_ctx); |
1061 | 1060 | ||
1062 | if (ctx->aead_recv) { | 1061 | if (ctx->aead_recv) { |
1063 | if (ctx->recv_pkt) { | 1062 | kfree_skb(ctx->recv_pkt); |
1064 | kfree_skb(ctx->recv_pkt); | 1063 | ctx->recv_pkt = NULL; |
1065 | ctx->recv_pkt = NULL; | ||
1066 | } | ||
1067 | crypto_free_aead(ctx->aead_recv); | 1064 | crypto_free_aead(ctx->aead_recv); |
1068 | strp_stop(&ctx->strp); | 1065 | strp_stop(&ctx->strp); |
1069 | write_lock_bh(&sk->sk_callback_lock); | 1066 | write_lock_bh(&sk->sk_callback_lock); |