Received: by 10.213.65.68 with SMTP id h4csp1898878imn; Mon, 19 Mar 2018 16:52:52 -0700 (PDT) X-Google-Smtp-Source: AG47ELu11LzexQQcJvN9+tj7pRVApGFaH2yLIWofb7PHne6kjdAXTm4WVp/uEzWcH2vEfxh34sY1 X-Received: by 2002:a17:902:768b:: with SMTP id m11-v6mr8239764pll.161.1521503572657; Mon, 19 Mar 2018 16:52:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521503572; cv=none; d=google.com; s=arc-20160816; b=hnfO35JEGjW5PstZo+mUeieehB8VTqvAVE6gao5scEBROOusxKfD7bAaPX8Gg3Lzsg fl8yWigONJxZRWr0pnGD7KppdmXzBvitawj+y32YRBq3HF5oJzZ2zsPH/GinbLOlf9/p E+fLW9Zaj7ij1KS94Cz4JtGzv4bifT56K8qqEWcU/lyFcqogdvDQdqhu7xl+qeaONF/L /vj/cRSFEGclHbOGD+leaoQlU+zls1OCm5BQtkhGd4XdaOiBs7w6jdkpAYGkn8WBeEzC eMRe2Kyu6bYQEDx77cL8cwr3dnZdNnjvDZp5B/Z/xqlUk6Tqxdcnx8KUvA/6ZTAqARjY ztDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=A8W5BY3E9D+wlQ6UcylKxt2MmrWOa8dHub0CNwnruWY=; b=AhQ9tQ7DBU/2eBPhaZ7UiDlNNcfDGgTD163aqgyYZ8N7yslh5bVAYkdYbzSY7vbaAc 7S/WmXw53VoSb/aAdZ3CAuH02OKV0wD5FXfBxtIVAs+lF4kMdZckM5F2ts4YHhhh6vK2 klSmzJ4xLIIHsy95rML5g3g7EMQJyXG1Xuop3syWzyoeHYOjLvulFOJoC5wS1EaCVpFN ssyGfcgw/85meSupwX01ANJQ96bXMK6cwb/dv/3IEot4dCREUgiSe5iBS5XtQKXpDIdP 5Xl9M0Lg7MeLYYO3+jSe34vXXGVPknAhSfN0o1V9FZBSoGu0Fsybo4GUoV02/HIVx0tY rIUw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QyYzp7XA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id s5si238597pgr.617.2018.03.19.16.52.38; Mon, 19 Mar 2018 16:52:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=QyYzp7XA; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935261AbeCSRLn (ORCPT + 99 others); Mon, 19 Mar 2018 13:11:43 -0400 Received: from mail-bn3nam01on0125.outbound.protection.outlook.com ([104.47.33.125]:62326 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S966625AbeCSQKh (ORCPT ); Mon, 19 Mar 2018 12:10:37 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=A8W5BY3E9D+wlQ6UcylKxt2MmrWOa8dHub0CNwnruWY=; b=QyYzp7XADZ8K0cT4D8SZENan+Yd5Y3K0aSDGqN4OzRZZmbb78IjqdG2obc0Hg261GJhYxvn05zChmdbu0pQOAHpjusuWzbiLgt4QNuBTGi4yBdwUDdeCwCgYGgMRLYsOeAHpZjk1DUcK8ZOnSEvwy+eZT8gyOTwHXTwCCrEm5mI= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1045.namprd21.prod.outlook.com (52.132.128.14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.631.0; Mon, 19 Mar 2018 16:10:34 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::3d9b:79e7:94eb:5d62%5]) with mapi id 15.20.0631.004; Mon, 19 Mar 2018 16:10:34 +0000 From: Sasha Levin To: "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" CC: Haishuang Yan , "David S . Miller" , Sasha Levin Subject: [PATCH AUTOSEL for 4.4 122/167] sit: reload iphdr in ipip6_rcv Thread-Topic: [PATCH AUTOSEL for 4.4 122/167] sit: reload iphdr in ipip6_rcv Thread-Index: AQHTv5xwHdzMEXXWDkqhZV+dN0kVmQ== Date: Mon, 19 Mar 2018 16:07:55 +0000 Message-ID: <20180319160513.16384-122-alexander.levin@microsoft.com> References: <20180319160513.16384-1-alexander.levin@microsoft.com> In-Reply-To: <20180319160513.16384-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1;DM5PR2101MB1045;7:Zx7ZU9gGZsT6I7B0HxuAmeQfIW/CuESH/dLNB8QSRUeDWsBtV/Z+pnTX4fJ71SBQ1fZyQtamlsDXXpmOlpSc9Qj0YcXFSJZ2YovD9c4ZIDQ62ed3afS8O6YDQZyu+svbE/jA6aOen02iB6wa1veDRu7wOI9Zr1vwFSiiQoBDNzz6DKEGJhv001dC56zY+IdamzNHWyVdqyJjFmhBNnnK5Jq/8GjIYZBgRvKy088yOejHNlNBFm8VHxQAzruuGVy0;20:2bZqoGUXkJ0hQIAc9y/tCIZM9nIh7n/qSLBgnVwFmWZsy+92mJYnM3YDpca881f2LojW/VTmJDsB5jLP9bjbNJpA+d3a7FqmwAx1hGxzozMShwZElnykAvekYMJSTLLoX0Suf25wUKuaqWpCUlH60hR3WPRyJ6dTmEFA6CegCA4= x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: b1f6ad36-57da-41d0-6b4c-08d58db3f232 x-microsoft-antispam: UriScan:;BCL:0;PCL:0;RULEID:(7020095)(4652020)(48565401081)(5600026)(4604075)(3008032)(4534165)(4627221)(201703031133081)(201702281549075)(2017052603328)(7193020);SRVR:DM5PR2101MB1045; x-ms-traffictypediagnostic: DM5PR2101MB1045: authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(173505980823694); x-exchange-antispam-report-cfa-test: BCL:0;PCL:0;RULEID:(8211001083)(61425038)(6040522)(2401047)(5005006)(8121501046)(3231221)(944501300)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123560045)(20161123562045)(20161123564045)(20161123558120)(6072148)(201708071742011);SRVR:DM5PR2101MB1045;BCL:0;PCL:0;RULEID:;SRVR:DM5PR2101MB1045; x-forefront-prvs: 06167FAD59 x-forefront-antispam-report: SFV:NSPM;SFS:(10019020)(346002)(376002)(366004)(39380400002)(39860400002)(396003)(199004)(189003)(86612001)(66066001)(6436002)(76176011)(10290500003)(6666003)(2950100002)(305945005)(8676002)(97736004)(6486002)(86362001)(25786009)(26005)(102836004)(8936002)(6512007)(7736002)(3280700002)(106356001)(107886003)(110136005)(68736007)(81156014)(22452003)(6506007)(186003)(54906003)(10090500001)(2900100001)(4326008)(2906002)(14454004)(81166006)(316002)(105586002)(6116002)(3846002)(5660300001)(36756003)(72206003)(1076002)(53936002)(3660700001)(99286004)(2501003)(5250100002)(478600001)(22906009)(217873001);DIR:OUT;SFP:1102;SCL:1;SRVR:DM5PR2101MB1045;H:DM5PR2101MB1032.namprd21.prod.outlook.com;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) x-microsoft-antispam-message-info: s4Dp8l/3KJ03Fn6V5nqv+9alsy4yfCXb6vrDQB6cCT22JhQe+0uBJrjbZelwArgkk/48C7l/eaSiGRS17ohwNaEIxNJGg6Exdca3XO4qZAg8wiPsYDTlQVPR1s6fGCE4zjZDmnMLMM7W9QnXgSNV/qyo7AIIj8IuU7rlT15EjEhl95rvC4dOVqRIRL1WLLteNrCKU5YU9El90XfwVw3BeMdsNI9E0gVLOU+jrwp14isXyRNt5X6sOrwpAQs20U8BcOpeQuyD5boZGCFVaY5UAW3jhHGFZXGIPNirOvgUoYu6y4oeaGgelVwxd/HUz/0RqLsWGsommqwUXQJpRUlXkg== spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: b1f6ad36-57da-41d0-6b4c-08d58db3f232 X-MS-Exchange-CrossTenant-originalarrivaltime: 19 Mar 2018 16:07:55.3448 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1045 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Haishuang Yan [ Upstream commit b699d0035836f6712917a41e7ae58d84359b8ff9 ] Since iptunnel_pull_header() can call pskb_may_pull(), we must reload any pointer that was related to skb->head. Fixes: a09a4c8dd1ec ("tunnels: Remove encapsulation offloads on decap") Signed-off-by: Haishuang Yan Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/ipv6/sit.c | 1 + 1 file changed, 1 insertion(+) diff --git a/net/ipv6/sit.c b/net/ipv6/sit.c index bbba435d0639..e71656fb5a22 100644 --- a/net/ipv6/sit.c +++ b/net/ipv6/sit.c @@ -690,6 +690,7 @@ static int ipip6_rcv(struct sk_buff *skb) =20 if (iptunnel_pull_header(skb, 0, htons(ETH_P_IPV6))) goto out; + iph =3D ip_hdr(skb); =20 err =3D IP_ECN_decapsulate(iph, skb); if (unlikely(err)) { --=20 2.14.1