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=-6.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 6807DC10F11 for ; Wed, 24 Apr 2019 17:44:15 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 2DCC02064A for ; Wed, 24 Apr 2019 17:44:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127855; bh=I0r4dGHvxf87fEIU+G+dNxo2nsE1FFSIr3dqRtMaJjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=S4TTWZN7pjCwhdDydTYSs0r6oY/E7tSU9j9CdU1t/i7bPuMu2hBU+F0nFxFER8KC4 xYrcxfuvb7CckOCHH1UxeMUaM1+dj6JiWx3gCBVy2XyQJb+8xMAyGyXYI4Ycq3fnNO 0N/iqc1EoYH/9v5yfkh2C6rMRQpWPJD3u0Zfd4lM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391709AbfDXRe0 (ORCPT ); Wed, 24 Apr 2019 13:34:26 -0400 Received: from mail.kernel.org ([198.145.29.99]:33206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391693AbfDXReV (ORCPT ); Wed, 24 Apr 2019 13:34:21 -0400 Received: from localhost (62-193-50-229.as16211.net [62.193.50.229]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 64B81218B0; Wed, 24 Apr 2019 17:34:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1556127260; bh=I0r4dGHvxf87fEIU+G+dNxo2nsE1FFSIr3dqRtMaJjs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RW9QoyO8MhCfQZOpqukiVkK28o7f0YElePayMYk0Bz+W23yq50rkWfVWibkkhRhez 1nMDiL3Sf9p0Yl/Mk8USyXRy8N35vSeQilvgV7ocyJ17SWe4GezqC+V92od0lF/IZN wsmcQzqSoLd7o0/p4wHQcaRr7SeCKtwlNalu/n2A= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Yuya Kusakabe , Takeru Hayasaka , Toshiaki Makita , "David S. Miller" Subject: [PATCH 5.0 007/115] net: Fix missing meta data in skb with vlan packet Date: Wed, 24 Apr 2019 19:09:03 +0200 Message-Id: <20190424170925.376894489@linuxfoundation.org> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190424170924.797924502@linuxfoundation.org> References: <20190424170924.797924502@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yuya Kusakabe [ Upstream commit d85e8be2a5a02869f815dd0ac2d743deb4cd7957 ] skb_reorder_vlan_header() should move XDP meta data with ethernet header if XDP meta data exists. Fixes: de8f3a83b0a0 ("bpf: add meta pointer for direct access") Signed-off-by: Yuya Kusakabe Signed-off-by: Takeru Hayasaka Co-developed-by: Takeru Hayasaka Reviewed-by: Toshiaki Makita Signed-off-by: David S. Miller Signed-off-by: Greg Kroah-Hartman --- net/core/skbuff.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -5083,7 +5083,8 @@ EXPORT_SYMBOL_GPL(skb_gso_validate_mac_l static struct sk_buff *skb_reorder_vlan_header(struct sk_buff *skb) { - int mac_len; + int mac_len, meta_len; + void *meta; if (skb_cow(skb, skb_headroom(skb)) < 0) { kfree_skb(skb); @@ -5095,6 +5096,13 @@ static struct sk_buff *skb_reorder_vlan_ memmove(skb_mac_header(skb) + VLAN_HLEN, skb_mac_header(skb), mac_len - VLAN_HLEN - ETH_TLEN); } + + meta_len = skb_metadata_len(skb); + if (meta_len) { + meta = skb_metadata_end(skb) - meta_len; + memmove(meta + VLAN_HLEN, meta, meta_len); + } + skb->mac_header += VLAN_HLEN; return skb; }