From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AE0A1C169C4 for ; Tue, 29 Jan 2019 06:53:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78FF52177E for ; Tue, 29 Jan 2019 06:53:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="VTcjhKhR" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1725805AbfA2Gxq (ORCPT ); Tue, 29 Jan 2019 01:53:46 -0500 Received: from mail-pl1-f196.google.com ([209.85.214.196]:35569 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725267AbfA2Gxp (ORCPT ); Tue, 29 Jan 2019 01:53:45 -0500 Received: by mail-pl1-f196.google.com with SMTP id p8so8941904plo.2 for ; Mon, 28 Jan 2019 22:53:45 -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; bh=MTgozvAZe6XipCScvg2O+6fhIYmiHx0b3m2djE0e4BM=; b=VTcjhKhRvT6+w7XD/XVwQ2VY/IQE68eutuuv/dSheVeePllFUZtQU523Lj/I3rb1mU wOPgZ0UO7IJmjQ+z9u5Bove5+ve46jH1s5UBPL6jgEKIonnVVoRQuvWYaWcbq0bF+0bG 1d1G2GUvyN14ADT2UH0mKKINzDt4UlzSgt/+gGhFV6j+ImlX6+//PW5QevqpgVT/tHdC KMfKkV53QI5OTWEWjsQzDF7PveYYJc1/ZRmj3MWR1nU3QHhQ4cqw9jve64RTa6upBJAU Blxo1WBLdUDg3/ezI9IUlKqQBzrHTSx2pKZIJ6MPM79wLpKOsiPrD/Hag8ZuAYT/0Kn+ YwDg== 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; bh=MTgozvAZe6XipCScvg2O+6fhIYmiHx0b3m2djE0e4BM=; b=csKJH5/hWVGga5olfuFJOtvLjEJwARBWW7ddOTlgpUwZsDMEximRjTXntqAivUfLth QbZ0JWrC+ipuKnYWMfvJ59q18aR76VG+8euxOcOH7n993eqcVZG7kFltW6gxVuBwCg2W p9NNGYCLeTE6BevcOOLOglVAXfUxLOkusVOke2fYHL3GsKrtnQQRHY8kpIbrayIjeDLE 0m7P9dw78/zrqbfJDpKn+rUyq6ynVBo/awPaAcosABo3LPMIFiC6Fd4ySp7ZqPA3ydyt VOgHk2RP+KreNn4jexhl++LwiHxbWklP1LoErT5vWoxqjTsQwv5YB5OHr1V7wG7hEQsM BNMQ== X-Gm-Message-State: AJcUukcQyGnAHE65+0/LCt3lPS15uD8cBL16zMUI7vFVxLpexM0i8F+L cAeAomCt1+dFUjPrENCNFa1M2Aq4qGg= X-Google-Smtp-Source: ALg8bN4+wohCZ+dy5uX9R0Vdmt54iK1aNBNQeCMZ95bZt6jd7wBf53KjoJw9XLJ1iNk6kITjfYOd+g== X-Received: by 2002:a17:902:82c2:: with SMTP id u2mr24813015plz.110.1548744825036; Mon, 28 Jan 2019 22:53:45 -0800 (PST) Received: from localhost.localdomain ([203.104.128.122]) by smtp.gmail.com with ESMTPSA id f67sm53703682pfc.141.2019.01.28.22.53.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Mon, 28 Jan 2019 22:53:44 -0800 (PST) From: Yohei Kanemaru To: netdev@vger.kernel.org, davem@davemloft.net, dlebrun@google.com Cc: Yohei Kanemaru Subject: [PATCH net] ipv6: sr: clear IP6CB(skb) on SRH ip4ip6 encapsulation Date: Tue, 29 Jan 2019 15:52:34 +0900 Message-Id: <20190129065234.68121-1-yohei.kanemaru@gmail.com> X-Mailer: git-send-email 2.10.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org skb->cb may contain data from previous layers (in an observed case IPv4 with L3 Master Device). In the observed scenario, the data in IPCB(skb)->frags was misinterpreted as IP6CB(skb)->frag_max_size, eventually caused an unexpected IPv6 fragmentation in ip6_fragment() through ip6_finish_output(). This patch clears IP6CB(skb), which potentially contains garbage data, on the SRH ip4ip6 encapsulation. Fixes: 32d99d0b6702 ("ipv6: sr: add support for ip4ip6 encapsulation") Signed-off-by: Yohei Kanemaru --- net/ipv6/seg6_iptunnel.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv6/seg6_iptunnel.c b/net/ipv6/seg6_iptunnel.c index 8181ee7..ee5403c 100644 --- a/net/ipv6/seg6_iptunnel.c +++ b/net/ipv6/seg6_iptunnel.c @@ -146,6 +146,8 @@ int seg6_do_srh_encap(struct sk_buff *skb, struct ipv6_sr_hdr *osrh, int proto) } else { ip6_flow_hdr(hdr, 0, flowlabel); hdr->hop_limit = ip6_dst_hoplimit(skb_dst(skb)); + + memset(IP6CB(skb), 0, sizeof(*IP6CB(skb))); } hdr->nexthdr = NEXTHDR_ROUTING; -- 2.10.0