From: Colin Ian King <colin.king@canonical.com>
Date: Tue, 24 Apr 2018 12:36:58 +0000 (+0100)
Subject: net/tls: remove redundant second null check on sgout
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=95ad7544ad3f6cf585e5b8587e7d520fa3a43ad5;p=openwrt%2Fstaging%2Fblogic.git

net/tls: remove redundant second null check on sgout

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

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);