* [PATCH] net/tls: remove redundant second null check on sgout
@ 2018-04-24 12:36 Colin King
2018-04-24 20:02 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Colin King @ 2018-04-24 12:36 UTC (permalink / raw)
To: Ilya Lesokhin, Aviad Yehezkel, Dave Watson, David S . Miller,
netdev
Cc: kernel-janitors, linux-kernel
From: Colin Ian King <colin.king@canonical.com>
A duplicated null check on sgout is redundant as it is known to be
already true because of the identical earlier check. Remove it.
Detected by cppcheck:
net/tls/tls_sw.c:696: (warning) Identical inner 'if' condition is always
true.
Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
net/tls/tls_sw.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c
index 71e79597f940..6ed1c02cfc94 100644
--- a/net/tls/tls_sw.c
+++ b/net/tls/tls_sw.c
@@ -693,8 +693,7 @@ static int decrypt_skb(struct sock *sk, struct sk_buff *skb,
if (!sgout) {
nsg = skb_cow_data(skb, 0, &unused) + 1;
sgin = kmalloc_array(nsg, sizeof(*sgin), sk->sk_allocation);
- if (!sgout)
- sgout = sgin;
+ sgout = sgin;
}
sg_init_table(sgin, nsg);
--
2.17.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] net/tls: remove redundant second null check on sgout
2018-04-24 12:36 [PATCH] net/tls: remove redundant second null check on sgout Colin King
@ 2018-04-24 20:02 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2018-04-24 20:02 UTC (permalink / raw)
To: colin.king
Cc: ilyal, aviadye, davejwatson, netdev, kernel-janitors,
linux-kernel
From: Colin King <colin.king@canonical.com>
Date: Tue, 24 Apr 2018 13:36:58 +0100
> From: Colin Ian King <colin.king@canonical.com>
>
> A duplicated null check on sgout is redundant as it is known to be
> already true because of the identical earlier check. Remove it.
> Detected by cppcheck:
>
> net/tls/tls_sw.c:696: (warning) Identical inner 'if' condition is always
> true.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
Applied to net-next, thank you.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-04-24 20:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-04-24 12:36 [PATCH] net/tls: remove redundant second null check on sgout Colin King
2018-04-24 20:02 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).