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;