From patchwork Mon Feb 25 23:08:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 1048018 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Jr3vrk1D"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 447dBR3drXz9sBr for ; Tue, 26 Feb 2019 10:17:03 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id C0D1C692E; Mon, 25 Feb 2019 23:17:00 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 135B76828 for ; Mon, 25 Feb 2019 23:08:59 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id D0F183D0 for ; Mon, 25 Feb 2019 23:08:58 +0000 (UTC) Received: by mail-pf1-f194.google.com with SMTP id q17so5199276pfh.10 for ; Mon, 25 Feb 2019 15:08:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id; bh=M4so2hwz3SCnViCsBl23GuUKS9k9r1Pj3rYnq7rBjyY=; b=Jr3vrk1DrgIMCrpBFCdE4/u08armWcL8s7GFdkvA4g26X3Lp/LikSSP0yneXPU3VMx 075C8SVPYh0to7MoXae/g4aucTrFY6R4RKwFZ0CyQCqhj0EoD0weEpM3aXpfV5OWXeVk MwTgRSNDnV3ZdR0JXIljskZFFI667iVC8cTqRdXi004FcYx4MB4EOkWbUTmLfkcTOH/A l2gfUR8Nqq6UdYP99inNwYR8VRDz3TRTFx4wSKQ4PVZhzvF2qWOgjHoHUPxbBVSkAhF1 mYcI+ls0G0nYCaFjroNdK7wZs/ymk+UCiH015OlllycURai7Ii0E0gs1AotGS84JdE6o WilQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id; bh=M4so2hwz3SCnViCsBl23GuUKS9k9r1Pj3rYnq7rBjyY=; b=R2EUuHxcjQ7/1/q/Es4DcOMmTMRHrMpxvLwtmTaktJtl7uMzHmq9Rrb+LX5qLEcLQb 8IN3V/rW7y/h5VSIYvPOnIyt1xyCZBna9BxgxYJ73r+j/GGkrWkZHMZJhYPnYdzom33N Ne4NneSUn2Lx2C7+rCjIV2eDgniH0U60AdOaQnwnIkN+FzwI7Ctn4BJC1qRw6QpRCjIV BIJKVSFSQELdb/JryswngW5wM49gGyUHc2KbgMIHLk7yGJEr3CWvnVLp3xLO0Ra5wMo5 WnBaElLnoAkmXcCxP3Q9xZwEh4rIGSt4BmhwMgkHdYQDsCHkmM8XjyPV5T0uCHZ6P0Ii F4yw== X-Gm-Message-State: AHQUAuaPngvnPYjNFF0lN4f6hlPWc29E8yPZEbwqxIudtjs+BZCDMLrN NYbLnzruwv7bDT3Xj+bYBmz2SMaD X-Google-Smtp-Source: AHgI3IaeIzNUZ/M0EshCgyD+QPe5sQlHJcx0XUU6jICU2+ouZjRojl4xpnDKRLEbB9CYeCj5PXv/2A== X-Received: by 2002:a65:5b4f:: with SMTP id y15mr21520143pgr.445.1551136138412; Mon, 25 Feb 2019 15:08:58 -0800 (PST) Received: from ubuntu.localdomain (c-76-102-76-212.hsd1.ca.comcast.net. [76.102.76.212]) by smtp.gmail.com with ESMTPSA id v26sm15606081pfg.62.2019.02.25.15.08.57 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Feb 2019 15:08:57 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Mon, 25 Feb 2019 15:08:49 -0800 Message-Id: <1551136130-121914-1-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [branch-2.8 1/2] packets: Change return type of 'packet_csum_upperlayer6'. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org Signed-off-by: Darrell Ball --- lib/packets.c | 2 +- lib/packets.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/packets.c b/lib/packets.c index 5f57030..a9893ea 100644 --- a/lib/packets.c +++ b/lib/packets.c @@ -1668,7 +1668,7 @@ packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *ip6) /* Calculate the IPv6 upper layer checksum according to RFC2460. We pass the ip6_nxt and ip6_plen values, so it will also work if extension headers are present. */ -uint16_t +ovs_be16 packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *ip6, const void *data, uint8_t l4_protocol, uint16_t l4_size) diff --git a/lib/packets.h b/lib/packets.h index 705d0b2..e4e0dca 100644 --- a/lib/packets.h +++ b/lib/packets.h @@ -930,7 +930,7 @@ struct icmp6_error_header { BUILD_ASSERT_DECL(ICMP6_ERROR_HEADER_LEN == sizeof(struct icmp6_error_header)); uint32_t packet_csum_pseudoheader6(const struct ovs_16aligned_ip6_hdr *); -uint16_t packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *, +ovs_be16 packet_csum_upperlayer6(const struct ovs_16aligned_ip6_hdr *, const void *, uint8_t, uint16_t); /* Neighbor Discovery option field. From patchwork Mon Feb 25 23:08:50 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darrell Ball X-Patchwork-Id: 1048019 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=openvswitch.org (client-ip=140.211.169.12; helo=mail.linuxfoundation.org; envelope-from=ovs-dev-bounces@openvswitch.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="I1m8osQl"; dkim-atps=neutral Received: from mail.linuxfoundation.org (mail.linuxfoundation.org [140.211.169.12]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 447dBq0WK2z9s71 for ; Tue, 26 Feb 2019 10:17:23 +1100 (AEDT) Received: from mail.linux-foundation.org (localhost [127.0.0.1]) by mail.linuxfoundation.org (Postfix) with ESMTP id 9C18A6935; Mon, 25 Feb 2019 23:17:01 +0000 (UTC) X-Original-To: dev@openvswitch.org Delivered-To: ovs-dev@mail.linuxfoundation.org Received: from smtp1.linuxfoundation.org (smtp1.linux-foundation.org [172.17.192.35]) by mail.linuxfoundation.org (Postfix) with ESMTPS id 572556828 for ; Mon, 25 Feb 2019 23:09:00 +0000 (UTC) X-Greylist: whitelisted by SQLgrey-1.7.6 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by smtp1.linuxfoundation.org (Postfix) with ESMTPS id 0E3263D0 for ; Mon, 25 Feb 2019 23:08:59 +0000 (UTC) Received: by mail-pg1-f173.google.com with SMTP id h8so4691051pgp.6 for ; Mon, 25 Feb 2019 15:08:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Quudvc7S4F/qaXixbrA4ysfX5xcdCYPNVyP7dAzup6o=; b=I1m8osQldT+D6j5lDGk+eL4/drO4uO9L96nUYPmBKGZC2pGgkE7nk+uIvwX8RWkMhE FlS0nDaMoyYDqcOjK/7nJQ/j0rg1hfwRFUNgd9beSroAYp4dU/DWmy026mNHfLCc/86L 1Fewez0Bkv/+s6SNvpqFQo5vNFKJywjVmWFf/vtX5z57ji9Rf8tVzAUHlyWbZwj50rNi KwPRl3CkWhsLSX7xGw0XSGmJ3Xh323Iz9dmathiLg3lVTV2IT8vziPDJdNqcILu0oqMj t0VP9B97VJI9BN9d0UwQxY1gMWjxvh+/CcSmJgJ66ZdgVab2N3CGLSLPwkW7BuiALShX GbUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Quudvc7S4F/qaXixbrA4ysfX5xcdCYPNVyP7dAzup6o=; b=IpLz+qEl0qskT5okSoLuBmdpvqvUMoR1OpkhY02TLhXzbkJKELJkvQseEAOySBRIMb NSIcXIhgaoW5TPrP9CTpHxOm+8PsMxroFh7pB4yK4/FASGqL5nVPkiTOV+T46H5JRegv OEzkHG3Vs0VDt0Mq6tC6Ioh5tv2NNVMUo08+U3vzQqacadH4M2L/lEVpmoBMOxHa88Cc sJaMJRS8ooSEzjHRO986UfhI05HMkPnFnp3a1nHq7hZOEOl0Jfa7Nyw85qYc5qwEkWTu qPQDG1ZEXl/Zhgv/dT9wxsa/2wrNMFun4p1GIdp4RsOkM5kFw/K3hx3sEmPDy08f5cLO i1hg== X-Gm-Message-State: AHQUAuakrO/yydDouG3qTJn5l0fsXVJduC+HB9+7LrQRR0/IaTO0mXP8 7Jv7yF1LfZCSMZxdzJKtABA= X-Google-Smtp-Source: AHgI3IbMUAxs2NXkLKzbxBw96c83s6QbP7uUXT+r4SL8k13lpflfw7YJqjHlVCsaNUzvu/Bh8WuOdg== X-Received: by 2002:a63:6196:: with SMTP id v144mr21215864pgb.137.1551136139643; Mon, 25 Feb 2019 15:08:59 -0800 (PST) Received: from ubuntu.localdomain (c-76-102-76-212.hsd1.ca.comcast.net. [76.102.76.212]) by smtp.gmail.com with ESMTPSA id v26sm15606081pfg.62.2019.02.25.15.08.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 25 Feb 2019 15:08:58 -0800 (PST) From: Darrell Ball To: dlu998@gmail.com, dev@openvswitch.org Date: Mon, 25 Feb 2019 15:08:50 -0800 Message-Id: <1551136130-121914-2-git-send-email-dlu998@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1551136130-121914-1-git-send-email-dlu998@gmail.com> References: <1551136130-121914-1-git-send-email-dlu998@gmail.com> X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on smtp1.linux-foundation.org Subject: [ovs-dev] [branch-2.8 2/2] conntrack: Fix L4 csum for V6 extension hdr pkts. X-BeenThere: ovs-dev@openvswitch.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: ovs-dev-bounces@openvswitch.org Errors-To: ovs-dev-bounces@openvswitch.org It is a day one issue that got copied to subsequent code. Fixes: a489b16854b5 ("conntrack: New userspace connection tracker.") Fixes: bd5e81a0e596 ("Userspace Datapath: Add ALG infra and FTP.") CC: Daniele Di Proietto Signed-off-by: Darrell Ball --- lib/conntrack.c | 29 +++++++++++------------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/lib/conntrack.c b/lib/conntrack.c index 6282552..0d38b2a 100644 --- a/lib/conntrack.c +++ b/lib/conntrack.c @@ -636,10 +636,9 @@ reverse_nat_packet(struct dp_packet *pkt, const struct conn *conn) true); } reverse_pat_packet(pkt, conn); - uint32_t icmp6_csum = packet_csum_pseudoheader6(nh6); icmp6->icmp6_base.icmp6_cksum = 0; - icmp6->icmp6_base.icmp6_cksum = csum_finish( - csum_continue(icmp6_csum, icmp6, tail - (char *) icmp6 - pad)); + icmp6->icmp6_base.icmp6_cksum = packet_csum_upperlayer6(nh6, icmp6, + IPPROTO_ICMPV6, tail - (char *) icmp6 - pad); } pkt->l3_ofs = orig_l3_ofs; pkt->l4_ofs = orig_l4_ofs; @@ -1529,19 +1528,14 @@ static inline bool checksum_valid(const struct conn_key *key, const void *data, size_t size, const void *l3) { - uint32_t csum = 0; - if (key->dl_type == htons(ETH_TYPE_IP)) { - csum = packet_csum_pseudoheader(l3); + uint32_t csum = packet_csum_pseudoheader(l3); + return csum_finish(csum_continue(csum, data, size)) == 0; } else if (key->dl_type == htons(ETH_TYPE_IPV6)) { - csum = packet_csum_pseudoheader6(l3); + return packet_csum_upperlayer6(l3, data, key->nw_proto, size) == 0; } else { return false; } - - csum = csum_continue(csum, data, size); - - return csum_finish(csum) == 0; } static inline bool @@ -3093,17 +3087,16 @@ handle_ftp_ctl(struct conntrack *ct, const struct conn_lookup_ctx *ctx, } } - const char *tail = dp_packet_tail(pkt); - uint8_t pad = dp_packet_l2_pad_size(pkt); th->tcp_csum = 0; - uint32_t tcp_csum; if (ctx->key.dl_type == htons(ETH_TYPE_IPV6)) { - tcp_csum = packet_csum_pseudoheader6(nh6); + th->tcp_csum = packet_csum_upperlayer6(nh6, th, ctx->key.nw_proto, + dp_packet_l4_size(pkt)); } else { - tcp_csum = packet_csum_pseudoheader(l3_hdr); + uint32_t tcp_csum = packet_csum_pseudoheader(l3_hdr); + th->tcp_csum = csum_finish( + csum_continue(tcp_csum, th, dp_packet_l4_size(pkt))); } - th->tcp_csum = csum_finish( - csum_continue(tcp_csum, th, tail - (char *) th - pad)); + return; }