From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 63F6D217F40; Thu, 12 Dec 2024 16:10:57 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019857; cv=none; b=VkUz8KCnBaNfx5vum+wW24PXUT8IjBTS2a4sS8h6dvXu7SSLHo/tnjUdfBEW3eTdhgBl79UkhGg0mxO+0nd1yT4kVlnlyw8M8ZorX8DbGoK7RCk5ZaKxa3U/HSsrrKHvkwkTaxBDMUli3b+PydUzk9+zuCK9gmC2+UQOEEIKqGA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734019857; c=relaxed/simple; bh=rURyyc5/oVTqEHObFCAqCWazZAUwF+PXKF6Vxj+kZDc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EFId0T6LucB0NiVpoBfzQW/Klm9PuuPQBdT9Eb97PESU/hrll27qtpAbn+Uwi07nxnmE6h3BFqxVg6CQ4GX1GxNNtpDYgW7ysfrnXxrk3ye/quRdMKn5Sieh0jD3KiULIkh90S+COFbA3ThO5aR6SrwFbSUSmAQtYFN3jgvBH1w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=lqJXYtYP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="lqJXYtYP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C73C6C4CECE; Thu, 12 Dec 2024 16:10:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734019857; bh=rURyyc5/oVTqEHObFCAqCWazZAUwF+PXKF6Vxj+kZDc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lqJXYtYPc1/5LeBXDg/+iGc1m9k04NhlEKd5W5W5MmVvVL7dKIOPHWPdzTCXkAkUi eMF+T66In0CD/WQTjmeJUUketBgveYKeCUSFIjasHj7Wk9UdoCHVdaXMPImr+rAqhU mME3LAAIuJYB4XvnQjfUuMmGsgC9CvBqNqwMJtSg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Eric Dumazet , George McCollister , Paolo Abeni , Sasha Levin Subject: [PATCH 6.1 316/772] net: hsr: fix hsr_init_sk() vs network/transport headers. Date: Thu, 12 Dec 2024 15:54:21 +0100 Message-ID: <20241212144402.946511779@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144349.797589255@linuxfoundation.org> References: <20241212144349.797589255@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Eric Dumazet [ Upstream commit 9cfb5e7f0ded2bfaabc270ceb5f91d13f0e805b9 ] Following sequence in hsr_init_sk() is invalid : skb_reset_mac_header(skb); skb_reset_mac_len(skb); skb_reset_network_header(skb); skb_reset_transport_header(skb); It is invalid because skb_reset_mac_len() needs the correct network header, which should be after the mac header. This patch moves the skb_reset_network_header() and skb_reset_transport_header() before the call to dev_hard_header(). As a result skb->mac_len is no longer set to a value close to 65535. Fixes: 48b491a5cc74 ("net: hsr: fix mac_len checks") Signed-off-by: Eric Dumazet Cc: George McCollister Link: https://patch.msgid.link/20241122171343.897551-1-edumazet@google.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/hsr/hsr_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/net/hsr/hsr_device.c b/net/hsr/hsr_device.c index ad75724b69adf..6e434af189bc0 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -253,6 +253,8 @@ static struct sk_buff *hsr_init_skb(struct hsr_port *master) skb->dev = master->dev; skb->priority = TC_PRIO_CONTROL; + skb_reset_network_header(skb); + skb_reset_transport_header(skb); if (dev_hard_header(skb, skb->dev, ETH_P_PRP, hsr->sup_multicast_addr, skb->dev->dev_addr, skb->len) <= 0) @@ -260,8 +262,6 @@ static struct sk_buff *hsr_init_skb(struct hsr_port *master) skb_reset_mac_header(skb); skb_reset_mac_len(skb); - skb_reset_network_header(skb); - skb_reset_transport_header(skb); return skb; out: -- 2.43.0