From patchwork Thu Dec 12 08:53:52 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Timo Teras X-Patchwork-Id: 300586 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id A71A42C009E for ; Thu, 12 Dec 2013 19:53:58 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751696Ab3LLIxz (ORCPT ); Thu, 12 Dec 2013 03:53:55 -0500 Received: from mail-la0-f42.google.com ([209.85.215.42]:61163 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751671Ab3LLIxy (ORCPT ); Thu, 12 Dec 2013 03:53:54 -0500 Received: by mail-la0-f42.google.com with SMTP id ec20so74382lab.1 for ; Thu, 12 Dec 2013 00:53:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=Dtcj/Hji03Mdf6uuCLRjmF29txh0baBsOVCGklr5SEE=; b=euoP3TqmCPupBAudGGKb6sRjRosh1vqHgZQjVvQzR1hA3H+NB63a1gNQzNCppPMv8D udphIlOT5rJGVEONxKHJd7P+sY63HX60FQpcTD6E9xJvAWp2xgQ6qkuPn49pwCDoSPeo 8JhZ23MDJjet9ZrJUdCF0ihxBknnuuBH7vdcIvoMnOpcXWX1tgX0fny8GXIlLcxQCkWo Oh0WaQVQVxHqUh2PciGIT2yzSI5jgt8QA0Ol/Vh5/D2b24gr/4q/Wngl1LyFpw7G4Zsr LpfADpPDoMomQs7EFTkvzJH54RG8QOl0s41XqltEcCok8WCWhAyVwVH84TOG6fTiBKR1 aZ6g== X-Received: by 10.152.4.162 with SMTP id l2mr2396329lal.75.1386838432693; Thu, 12 Dec 2013 00:53:52 -0800 (PST) Received: from vostro.util.wtbts.net ([83.145.235.199]) by mx.google.com with ESMTPSA id e10sm33416395laa.6.2013.12.12.00.53.51 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2013 00:53:51 -0800 (PST) From: =?UTF-8?q?Timo=20Ter=C3=A4s?= To: netdev@vger.kernel.org Cc: =?UTF-8?q?Timo=20Ter=C3=A4s?= , Pravin B Shelar Subject: [PATCH net] ip_gre: fix msg_name parsing for recvfrom/recvmsg Date: Thu, 12 Dec 2013 10:53:52 +0200 Message-Id: <1386838432-18889-1-git-send-email-timo.teras@iki.fi> X-Mailer: git-send-email 1.8.5.1 MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ipgre_header_parse() needs to parse the tunnel's ip header for getting the link-layer addresses, and uses mac_header to get the header. This fixes setting mac_header on the receive path to original behaviour. Bug added in commit c54419321455 (GRE: Refactor GRE tunneling code.) Cc: Pravin B Shelar Signed-off-by: Timo Teräs --- Alternate would be to do skb_reset_inner_headers() in ip_tunnel_rcv() and update ipgre_header_parse() to use skb_inner_network_header(). Though, then inner would then be referring to the "outer" headers. If applied as-is, should go to -stable too. net/ipv4/ip_gre.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv4/ip_gre.c b/net/ipv4/ip_gre.c index d7aea4c..cc2c7f1 100644 --- a/net/ipv4/ip_gre.c +++ b/net/ipv4/ip_gre.c @@ -217,6 +217,7 @@ static int ipgre_rcv(struct sk_buff *skb, const struct tnl_ptk_info *tpi) iph->saddr, iph->daddr, tpi->key); if (tunnel) { + skb->mac_header = skb->network_header; ip_tunnel_rcv(tunnel, skb, tpi, log_ecn_error); return PACKET_RCVD; }