From patchwork Fri Mar 9 15:34:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 883702 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="koNgVHXz"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zyWfX5bZ7z9sc2 for ; Sat, 10 Mar 2018 02:35:16 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751238AbeCIPfO (ORCPT ); Fri, 9 Mar 2018 10:35:14 -0500 Received: from mail-pl0-f68.google.com ([209.85.160.68]:43060 "EHLO mail-pl0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbeCIPfN (ORCPT ); Fri, 9 Mar 2018 10:35:13 -0500 Received: by mail-pl0-f68.google.com with SMTP id f23-v6so5414318plr.10 for ; Fri, 09 Mar 2018 07:35:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=TQWbCd/zBu47M4pxA0nSDLG+y3KVIhV4WpCvE+BiX+g=; b=koNgVHXzwksHfi+VkadASfJD4DCxBYIKGugJLAMtdvHPxShzYT0vgjVLBLrwjCOhkU /LMBvs9T/3gQbhwc4L8ryFBk+RbnNujRRLHhN1RB1Cf4W9apI+JSwrr6QncnXwTRgbNd yjLCJbrCJV8P9yjJ5YHSUvaZ4AZFqtESoyetvpM3MX6Br+3sw+e8xdDMAlolN6f3yUje 975RXiZAJs+yRSwMF+GJCQdJ0dMixhfy0DVJbFddyD21EqRfrWXf0HGhnFFayjIOrVdP RUoO4pJkFCic8ufSntIyuk+2bp/bOg2QITOa1zasbVgdlXuR2tvd4OQ7upCfOE0dD+Es EXJA== 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:in-reply-to :references; bh=TQWbCd/zBu47M4pxA0nSDLG+y3KVIhV4WpCvE+BiX+g=; b=YJu3ULC4clJU3/ZfgUJxlnA6JDJkVa07jFm83HoFd3QHLYtNM8wG/3R961PKHm75U/ +R87D3qdTvJi09IgexWtUFU64QTB6aVquRdGUCIPgxnYdSBMMNGqFmQPG3HpfMf1OSQL 3TY7EGMAdxbQ+ObR6sv9wWI35nAjdSk2H2EzA5tl38ku5AJHT6qCJLC5gsdg0OgHh7GF aLx8xDyQR5Dvj6t/tIi+e7aLu2NXziR14cLu8XB5CRc3xYAv8EMDWLa+hCeYX80uojaQ RMifpsJMnBQMt4KV/YSdfKavAdYesXRali8bSbZe9cY/0WJau4uzrhQcQvohOeWwnzju U8Nw== X-Gm-Message-State: APf1xPDgJqBKsCX4Eb8MO7tEwTu8PYH+3RlVRwkF1GJTdo7aZbxhVnGS UKGzwb2aEk9pZNP7FC54P1E8s+Id X-Google-Smtp-Source: AG47ELsf8TDqEXjyd/1BrTGdh9SGPBEkGhBLzDheDNVkQsQdvC4ZhWIywII8BFcF4B+T1nnA3/dKOQ== X-Received: by 2002:a17:902:aa03:: with SMTP id be3-v6mr26459590plb.211.1520609712344; Fri, 09 Mar 2018 07:35:12 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id q20sm3283443pgc.84.2018.03.09.07.35.11 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:35:11 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net 1/3] ip6gre: add erspan v2 to tunnel lookup Date: Fri, 9 Mar 2018 07:34:40 -0800 Message-Id: <1520609682-101077-2-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520609682-101077-1-git-send-email-u9012063@gmail.com> References: <1520609682-101077-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds the erspan v2 proto in ip6gre_tunnel_lookup so the erspan v2 tunnel can be found correctly. Signed-off-by: William Tu --- net/ipv6/ip6_gre.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 18a3dfbd0300..a056c2bb4b9a 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -126,7 +126,8 @@ static struct ip6_tnl *ip6gre_tunnel_lookup(struct net_device *dev, struct ip6_tnl *t, *cand = NULL; struct ip6gre_net *ign = net_generic(net, ip6gre_net_id); int dev_type = (gre_proto == htons(ETH_P_TEB) || - gre_proto == htons(ETH_P_ERSPAN)) ? + gre_proto == htons(ETH_P_ERSPAN) || + gre_proto == htons(ETH_P_ERSPAN2)) ? ARPHRD_ETHER : ARPHRD_IP6GRE; int score, cand_score = 4; From patchwork Fri Mar 9 15:34:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 883703 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="gg2bgUrM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zyWfg3W4Fz9sW3 for ; Sat, 10 Mar 2018 02:35:23 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932076AbeCIPfW (ORCPT ); Fri, 9 Mar 2018 10:35:22 -0500 Received: from mail-pl0-f67.google.com ([209.85.160.67]:35039 "EHLO mail-pl0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751137AbeCIPfN (ORCPT ); Fri, 9 Mar 2018 10:35:13 -0500 Received: by mail-pl0-f67.google.com with SMTP id w22-v6so5418733pll.2 for ; Fri, 09 Mar 2018 07:35:13 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=3VHY9WZ3Vwr+QJv+AdgthllwRJs2OBSmus5OIxWTYIc=; b=gg2bgUrMpuS2Ug86mEeW+8Qi/auvIbCYrjE4sub4vhB3gDkQutsxJPoIyKwN/keM62 n/7cgeVvGplV6ZNKS5AwFMO5H+xZ5iRHMQvsFGkqMUrMJSjsCLIENOguf4ZXhl5Dag/a 8LG/4iDPJ0PrXvn50rbh+Y5wJ/47hnI3c1DCMUaifA2TH+0IYg3Q6B4noT8wBa/T7QvK Vl0HCBMnbcQthQNeM4FuDHsTM5HdWxgxdvL2gtYmCG98cxm5R7OcAE1VWYU3CBjAvmJp RT5OPdpqNzmOZ6xVIEuHbqKLINrOsvEm82KBkfASbLQ3SgvFfgaLlP2/wtK+amZSgY6g 72yQ== 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:in-reply-to :references; bh=3VHY9WZ3Vwr+QJv+AdgthllwRJs2OBSmus5OIxWTYIc=; b=Q+68XFWuRpVp6fLY+s4H3Q/ke9gUs1cpR/+fEUcWCGuxL/OnD7Ta7FWB92GqS2YYAd DtGjzQpY4DJBNYLw0gG3TDY45yOld3FNTrAW/RoUgj2gLNywVx8M5RaHnyT3gi3ieSh9 lbFih6Z2HidXQGe3ZCbBgGzQmmfwdU5Le6V5ybcYaMHFOmR0gHCSQCzMqPkiRSr0sY96 nIAx95J9V+B94+npqy9gPcdO5v7cDpvpIqQxb50U11PhP4PMBH2LrxOJuNxqynQqYHWe cEB825crHHFHDXXEaEE15IxCTQ9pyBAP0B8aOVh7YurDiVATBAKmDr4vm7yS4tQsgPsR hq8g== X-Gm-Message-State: APf1xPCI3P5FoLCcmi+42RBtOSQTn6KWOKdjzYHotMKmkQ8i7xlsvCZu HARmkE2Y2pmgwf0x4RhqYi7iWRpF X-Google-Smtp-Source: AG47ELtr8go7eH6OkCxJaEpZ2J6EWjLEh8vRC27ijh9c3p/C/BQU2WOdw9m/7gxE6A5tHQuGsFiMew== X-Received: by 2002:a17:902:5819:: with SMTP id m25-v6mr27805001pli.248.1520609713286; Fri, 09 Mar 2018 07:35:13 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id q20sm3283443pgc.84.2018.03.09.07.35.12 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:35:12 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net 2/3] ip6erspan: improve error handling for erspan version number. Date: Fri, 9 Mar 2018 07:34:41 -0800 Message-Id: <1520609682-101077-3-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520609682-101077-1-git-send-email-u9012063@gmail.com> References: <1520609682-101077-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org When users fill in incorrect erspan version number through the struct erspan_metadata uapi, current code skips pushing the erspan header but continue pushing the gre header, which is incorrect. The patch fixes it by returning error. Signed-off-by: William Tu --- net/ipv6/ip6_gre.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index a056c2bb4b9a..4ab476d3a46e 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -948,6 +948,8 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, md->u.md2.dir, get_hwid(&md->u.md2), truncate, false); + } else { + goto tx_err; } } else { switch (skb->protocol) { From patchwork Fri Mar 9 15:34:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: William Tu X-Patchwork-Id: 883704 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="AOYJ9YWi"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3zyWg849L4z9sW3 for ; Sat, 10 Mar 2018 02:35:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932070AbeCIPfU (ORCPT ); Fri, 9 Mar 2018 10:35:20 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:46434 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751193AbeCIPfS (ORCPT ); Fri, 9 Mar 2018 10:35:18 -0500 Received: by mail-pf0-f196.google.com with SMTP id z10so1401115pfh.13 for ; Fri, 09 Mar 2018 07:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references; bh=juYctQH++w8QUa7xgYbo3LaTeb8fcc5qeeZh08V50Z4=; b=AOYJ9YWihIvxqS/r3mEuTqzYSI4I0+UnynkgUdeY5OlEUNG8qeZ8sNpmJCBiI6zhU1 nA12WkGtm3yyFMBeZgKbign5v1D10RwHft6V+0FYfmhHj8FeVxndBtBTzCBCQKha6Baz NjK1FLJV4Gm6xYwVXXF0TrEyc/LiuFDQfCQXE70pATPL0kwu8KFXwLwx0DFdISLF9UzD AlMkFZ/BpgKlfB4nau2MrygLp0KjMIbz+Bw15gzu8b45IgYOeHfWVWG4m8GTjAkHhVKj eoRKbyrbJftcpYxekEaYOxhR0+1h7PboT2ih56NKnIQlsHe7fQsjicgpXndYXDLmICxT XrNw== 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:in-reply-to :references; bh=juYctQH++w8QUa7xgYbo3LaTeb8fcc5qeeZh08V50Z4=; b=tP8UwJbqhyjE1awJc9dWeUIjcksiW6jxamkLY8gCZzrKiVZRWvpsBdLan15LNGypL6 7mZjV2rJFbdohd447vWH867QVRT5SJ30iJn6KVciUzc2IfQ0abNO9tcTPzE5GPr0f3FC FsuWmyRpMczXPwST1qJeeQ7Irjd5iOv81LkpvAKjVEPI4oe4drBQBwhqx0og/ruY6xh2 CuJbWCD9UgKv3tsVDIo4am02CZxDfCOhVWZ20IBe/HmeswVBtXAUPjSBQ+AH0LdmH+8r tJUv/YXZ6jq/nVVS96Nxusw8vkTQKQVzkbe7kkYjR4fcjmetpROs2bi0NqgI6Zk+wrxw GT0w== X-Gm-Message-State: APf1xPBRu9xWMasDLgispgRo+YtP/PzMR32VTIUqVVhpPofC3Uyto5Uc SWfWobQydGp25+HES68QH6YFm/WI X-Google-Smtp-Source: AG47ELvEIZWK21NOkhMITsb27OTJ2/Hze5Ppl597cOJrLE9mQHaEBhE3EkC6LH3rfW7DhKfkwF3VwA== X-Received: by 10.99.64.198 with SMTP id n189mr24450116pga.191.1520609718189; Fri, 09 Mar 2018 07:35:18 -0800 (PST) Received: from sc9-mailhost3.vmware.com ([24.5.191.4]) by smtp.gmail.com with ESMTPSA id q20sm3283443pgc.84.2018.03.09.07.35.13 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 09 Mar 2018 07:35:13 -0800 (PST) From: William Tu To: netdev@vger.kernel.org Subject: [PATCH net 3/3] ip6erspan: make sure enough headroom at xmit. Date: Fri, 9 Mar 2018 07:34:42 -0800 Message-Id: <1520609682-101077-4-git-send-email-u9012063@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1520609682-101077-1-git-send-email-u9012063@gmail.com> References: <1520609682-101077-1-git-send-email-u9012063@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The patch adds skb_cow_header() to ensure enough headroom at ip6erspan_tunnel_xmit before pushing the erspan header to the skb. Signed-off-by: William Tu --- net/ipv6/ip6_gre.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/net/ipv6/ip6_gre.c b/net/ipv6/ip6_gre.c index 4ab476d3a46e..9a759bbbd8a6 100644 --- a/net/ipv6/ip6_gre.c +++ b/net/ipv6/ip6_gre.c @@ -906,6 +906,9 @@ static netdev_tx_t ip6erspan_tunnel_xmit(struct sk_buff *skb, truncate = true; } + if (skb_cow_head(skb, dev->needed_headroom)) + goto tx_err; + t->parms.o_flags &= ~TUNNEL_KEY; IPCB(skb)->flags = 0;