From patchwork Wed May 7 23:51:46 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Herbert X-Patchwork-Id: 346850 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 771971400A3 for ; Thu, 8 May 2014 09:51:52 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752181AbaEGXvs (ORCPT ); Wed, 7 May 2014 19:51:48 -0400 Received: from mail-vc0-f202.google.com ([209.85.220.202]:33713 "EHLO mail-vc0-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751486AbaEGXvr (ORCPT ); Wed, 7 May 2014 19:51:47 -0400 Received: by mail-vc0-f202.google.com with SMTP id if11so272751vcb.1 for ; Wed, 07 May 2014 16:51:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:subject:message-id:user-agent:mime-version :content-type; bh=nBCZYxFtNAJc4QIzw2jk8GrPmT8QP7IKsfKgqCGwxoY=; b=HDQYvUsJ8i8Y51AXo0XqLw1apmPFxstL79pfk1kHr12P+V5yQj8d0isowV+qVGrLOL cltsZiIxvHhuSO41AwN9kL9JETtnhR4SOj1gozipYCPUzZZR9uv+JMETLYNXA9j6JdHH iuyaLzN5sBKGQKELKLmjHjCT5JAw1Ed4A44OsaioAVZHAR5ZNNPHbdjOCb84PY9dviUN EFL+wiaEDczdO/VlcTLTVLm4XD1njhz7Lpl6TUIAsvt4AUdPLsNwf3ruF7XM2aItdzRc 1BWRjyU/TqEMnzr9wsGaZSx5y8DWMxAqRrqlPe7js92gyhXga2bFUQm6BHIDRaP7w7ab LhWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:user-agent :mime-version:content-type; bh=nBCZYxFtNAJc4QIzw2jk8GrPmT8QP7IKsfKgqCGwxoY=; b=UrET1DV51H08/IInL1gd6yvODjKP/sA4KkGjpAqAclhQkkHAIne64U+9pYT4NTNegu ANhtW2apiBpw0OPWbATAhtPQAkE7jjYYf3ZWq945NnequgMU6pOsqI8vQXIoa4QSonnl MOE7cu3pCL6+DCGXq4TknuWGb6YByAR0+0oT6O2WCv99g2PT7aB1D6E0nFxPU2KgB1hg Pb1a48nXaqHqxfx5HTZowSK0L9ARkQfJno2Dh6imHo9Gr0SXt9gW0oOMCQSEP3weuLnv /rxpBcd8pJ8exO1pCb1jljE7CW1Ztj8MYpxxPERf+DWml6My06YkA7/kKEUoQe3vrMF+ gTNg== X-Gm-Message-State: ALoCoQlwW1QEMsMKutKs/c0DXDNXietFEYMqyqzM4l6+8LnXC8NRIigIOo88vqPXTISKx3VsvLhw X-Received: by 10.52.61.197 with SMTP id s5mr134060vdr.8.1399506706647; Wed, 07 May 2014 16:51:46 -0700 (PDT) Received: from corp2gmr1-2.hot.corp.google.com (corp2gmr1-2.hot.corp.google.com [172.24.189.93]) by gmr-mx.google.com with ESMTPS id c50si764838yhl.7.2014.05.07.16.51.46 for (version=TLSv1.1 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 07 May 2014 16:51:46 -0700 (PDT) Received: from tomh.mtv.corp.google.com (tomh.mtv.corp.google.com [172.18.117.126]) by corp2gmr1-2.hot.corp.google.com (Postfix) with ESMTP id 7F7D65A41A5; Wed, 7 May 2014 16:51:46 -0700 (PDT) Received: by tomh.mtv.corp.google.com (Postfix, from userid 60832) id 417D720095C; Wed, 7 May 2014 16:51:46 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by tomh.mtv.corp.google.com (Postfix) with ESMTP id 34B4C20042C; Wed, 7 May 2014 16:51:46 -0700 (PDT) Date: Wed, 7 May 2014 16:51:46 -0700 (PDT) From: Tom Herbert To: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 1/7] gre: Call skb_checksum_simple_validate Message-ID: User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Use skb_checksum_simple_validate to verify checksum. Signed-off-by: Tom Herbert --- net/ipv4/gre_demux.c | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/net/ipv4/gre_demux.c b/net/ipv4/gre_demux.c index 250be74..fbfd829 100644 --- a/net/ipv4/gre_demux.c +++ b/net/ipv4/gre_demux.c @@ -93,28 +93,6 @@ void gre_build_header(struct sk_buff *skb, const struct tnl_ptk_info *tpi, } EXPORT_SYMBOL_GPL(gre_build_header); -static __sum16 check_checksum(struct sk_buff *skb) -{ - __sum16 csum = 0; - - switch (skb->ip_summed) { - case CHECKSUM_COMPLETE: - csum = csum_fold(skb->csum); - - if (!csum) - break; - /* Fall through. */ - - case CHECKSUM_NONE: - skb->csum = 0; - csum = __skb_checksum_complete(skb); - skb->ip_summed = CHECKSUM_COMPLETE; - break; - } - - return csum; -} - static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, bool *csum_err) { @@ -141,7 +119,7 @@ static int parse_gre_header(struct sk_buff *skb, struct tnl_ptk_info *tpi, options = (__be32 *)(greh + 1); if (greh->flags & GRE_CSUM) { - if (check_checksum(skb)) { + if (skb_checksum_simple_validate(skb)) { *csum_err = true; return -EINVAL; }