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) {