From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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) 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> 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 List-ID: 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) { -- 2.7.4