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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,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 09B45C282DD for ; Fri, 10 Jan 2020 22:08:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D1B622072E for ; Fri, 10 Jan 2020 22:08:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578694085; bh=MHAtYlRbW9J6ju9my8jxppJ8GdNyh4Gf/jDbDQ5YUUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=C7ihAK3AZvUvi3gZbRJGu9sN9o4LODjz+v9PRGe0xaJuw+quFiblGuPkmQQ2nmNB9 DH4eAwF5BPSfji9i5HMsDwBOgj0TE8uDeAYIYheifI3ZlD1NuyJj7gF34NQYlOgV50 y3ebmxNOcBGHmWVc4wemaU7WDj5QplgwiNfO+gJU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728304AbgAJWIF (ORCPT ); Fri, 10 Jan 2020 17:08:05 -0500 Received: from mail.kernel.org ([198.145.29.99]:55128 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727880AbgAJWHY (ORCPT ); Fri, 10 Jan 2020 17:07:24 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AEC0D2082E; Fri, 10 Jan 2020 22:07:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1578694044; bh=MHAtYlRbW9J6ju9my8jxppJ8GdNyh4Gf/jDbDQ5YUUM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NuAlUSrQNbdJxlP9BAJtcq2GmrNKNNJaN9bSw9NkkKNF+3GlvvSyVJAJmJWM4F8P2 c9hvuWWDX64A7fLJqoZm5WqppxEms8zjbeZcjnRphIj2artMQ/1Hm35/6GlZfkKTVv 6hG9+5l0keVp2KSAJbXFpgB924DSTJrPLEeegLJE= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Taehee Yoo , "David S . Miller" , Sasha Levin , netdev@vger.kernel.org Subject: [PATCH AUTOSEL 4.9 2/6] hsr: reset network header when supervision frame is created Date: Fri, 10 Jan 2020 17:07:17 -0500 Message-Id: <20200110220721.28780-2-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200110220721.28780-1-sashal@kernel.org> References: <20200110220721.28780-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Taehee Yoo [ Upstream commit 3ed0a1d563903bdb4b4c36c58c4d9c1bcb23a6e6 ] The supervision frame is L2 frame. When supervision frame is created, hsr module doesn't set network header. If tap routine is enabled, dev_queue_xmit_nit() is called and it checks network_header. If network_header pointer wasn't set(or invalid), it resets network_header and warns. In order to avoid unnecessary warning message, resetting network_header is needed. Test commands: ip netns add nst ip link add veth0 type veth peer name veth1 ip link add veth2 type veth peer name veth3 ip link set veth1 netns nst ip link set veth3 netns nst ip link set veth0 up ip link set veth2 up ip link add hsr0 type hsr slave1 veth0 slave2 veth2 ip a a 192.168.100.1/24 dev hsr0 ip link set hsr0 up ip netns exec nst ip link set veth1 up ip netns exec nst ip link set veth3 up ip netns exec nst ip link add hsr1 type hsr slave1 veth1 slave2 veth3 ip netns exec nst ip a a 192.168.100.2/24 dev hsr1 ip netns exec nst ip link set hsr1 up tcpdump -nei veth0 Splat looks like: [ 175.852292][ C3] protocol 88fb is buggy, dev veth0 Fixes: f421436a591d ("net/hsr: Add support for the High-availability Seamless Redundancy protocol (HSRv0)") Signed-off-by: Taehee Yoo Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/hsr/hsr_device.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index 52694cb759b0..aead5ac4dbf6 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -281,6 +281,8 @@ static void send_hsr_supervision_frame(struct hsr_port *master, skb->dev->dev_addr, skb->len) <= 0) goto out; skb_reset_mac_header(skb); + skb_reset_network_header(skb); + skb_reset_transport_header(skb); if (hsrVer > 0) { hsr_tag = (typeof(hsr_tag)) skb_put(skb, sizeof(struct hsr_tag)); -- 2.20.1