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 7F9F7211493; Thu, 12 Dec 2024 17:23:45 +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=1734024225; cv=none; b=hkVvHkv/dxhUPtkzmAdw6bV880OHmVUap8Ab6fkR0YRVIIzJ4QKDZ3SoK27oFi0x3Nfvg3rzjvpY4srUypfUDb/4okTmtyrbeIQkYdo2N5qi6w8d/33nzT/XHbgFLCyJMgusmXJEvQ6NbuOoYSqqbYCR1Cqhb0D1F4YxZDCx0lw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734024225; c=relaxed/simple; bh=+yAaO9GQTy3m5G+khab8uuJvP/7T9kIY3MtrVjELjUc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=EIysOXOTVYWvQTJs4IFDnQCSsrWpR3dlVOhokx9pDgF7ceGgzX2+YxadvEulL7DBbLg3TwjpMid3iZmDl4BnmAG7JIH11MrG8Gc4AYzUMTOOqeXVylf8IkiqglEZjXkZ1B1kWRJGvhnIL4MjunvydA0B2X1poASGRvPCSDJNBC0= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=copi5Ht0; 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="copi5Ht0" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 070E2C4CECE; Thu, 12 Dec 2024 17:23:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734024225; bh=+yAaO9GQTy3m5G+khab8uuJvP/7T9kIY3MtrVjELjUc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=copi5Ht0pedo7fwO3hzKmkdq32Qi8ngJnroi0SYN9zDX6dO7xPrLbM7aFMrN7aCHP gOwlyXJS6Qvy1AyJ+06IBM0ueOi0pHtC4UVbHAT9I+d8ZeKZy3F2UERh73jk+G4Hlr m6JScJ3HeuFUAnirBHgEnVRfFrCf7mYTOqKKZx7M= 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 5.10 227/459] net: hsr: fix hsr_init_sk() vs network/transport headers. Date: Thu, 12 Dec 2024 15:59:25 +0100 Message-ID: <20241212144302.537223969@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144253.511169641@linuxfoundation.org> References: <20241212144253.511169641@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 5.10-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 c5a4c5fb72934..505eb58f7e081 100644 --- a/net/hsr/hsr_device.c +++ b/net/hsr/hsr_device.c @@ -256,6 +256,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) @@ -263,8 +265,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