From patchwork Sun Aug 3 18:45:19 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Popov X-Patchwork-Id: 376085 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 209CB140093 for ; Mon, 4 Aug 2014 04:45:41 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751585AbaHCSp2 (ORCPT ); Sun, 3 Aug 2014 14:45:28 -0400 Received: from mail-lb0-f178.google.com ([209.85.217.178]:51793 "EHLO mail-lb0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751536AbaHCSp1 (ORCPT ); Sun, 3 Aug 2014 14:45:27 -0400 Received: by mail-lb0-f178.google.com with SMTP id c11so4710656lbj.9 for ; Sun, 03 Aug 2014 11:45:25 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:subject:message-id :mime-version:content-type:content-transfer-encoding; bh=467/UX8+jV449XNwjlF8BeFwqqelh5SjsRJlDHNIh2Y=; b=QF57AKKCGbb/5VEryV+vh75FAYS9v/mC53u009rYOc9n0wSOqOVKmabG31DIMjLRbT eVDd1NAxWoRYr82p1A38oNKpdi/LARj4CZvS7xlBe0ttaTi0sCYU+pBRn1s8QkJG3IHm C8x+rkfhEFJc+bFOX37JuaETtMuzXU5JgoK7X50dQ9Pty+0xHyKsGjxDiaPquUGA289N B6tMhXSMeNOZzrCJd8+FQUef5/Bs5bLHfcbVZV2Hk5xXL85H0uFBVrPGkelBlCnf24+K zBGma1WuFsmxJbjjIqH9wrg2um3F2S9PGJ5XFF8sPAz6tnfMB7SVPXjMykLw4IeG+SWD FuHw== X-Gm-Message-State: ALoCoQmj2joVieeeURvpghev1RsU+8QzaIj81k8hoCNP588PvV8mjMoaqKftMJF0otXmjJKQ011v X-Received: by 10.153.11.162 with SMTP id ej2mr3250513lad.15.1407091525604; Sun, 03 Aug 2014 11:45:25 -0700 (PDT) Received: from notedoe ([213.87.135.105]) by mx.google.com with ESMTPSA id xm1sm23928681lbb.15.2014.08.03.11.45.21 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 03 Aug 2014 11:45:24 -0700 (PDT) Date: Sun, 3 Aug 2014 22:45:19 +0400 From: Dmitry Popov To: "David S. Miller" , netdev@vger.kernel.org Subject: [PATCH] tcp: md5: remove unneeded check in tcp_v4_parse_md5_keys Message-Id: <20140803224519.49a40242da5c1cbe61f97753@qrator.net> X-Mailer: Sylpheed 3.4.2 (GTK+ 2.24.24; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcpm_key is an array inside struct tcp_md5sig, there is no need to check it against NULL. Signed-off-by: Dmitry Popov Acked-by: YOSHIFUJI Hideaki --- net/ipv4/tcp_ipv4.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c index 77cccda..8ea4eff 100644 --- a/net/ipv4/tcp_ipv4.c +++ b/net/ipv4/tcp_ipv4.c @@ -1064,7 +1064,7 @@ static int tcp_v4_parse_md5_keys(struct sock *sk, char __user *optval, if (sin->sin_family != AF_INET) return -EINVAL; - if (!cmd.tcpm_key || !cmd.tcpm_keylen) + if (!cmd.tcpm_keylen) return tcp_md5_do_del(sk, (union tcp_md5_addr *)&sin->sin_addr.s_addr, AF_INET);