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 C7664223338; Thu, 12 Dec 2024 16:56:38 +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=1734022598; cv=none; b=fdWfZ1g1itCd1g95HJbFQvuPsgRagPRToL8KXI1/0ZOqeMVjchIe9F2lTzh0MPraubx64rBRW94YaEnUhjs3X5p35ZQ9LW8ypo+sYNtINzCHpq/uOgsC0XKsdbgcuVQ0FFyTfZvGjwVqWsjfLXDBztuLXHbW5st1HKAjLisEBls= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1734022598; c=relaxed/simple; bh=vtcnZCVY2j5Ckah5CPhaVqP7YTwy8t2Dd0PdTjn/AbI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aMXSZIb2MZyZS58i9BoA/tgBw2Za9PO78Y6DaZ8ikUOFEPVDhmzZYMKmkS8m4XJ3koXrQu4BLDDvmYnHOAXxomW6SNCDzrYZmD19Fh0vuYPLcFUhWxDuwdPtTdp4rGEOc4kztQtyPfi+7yp2qiQ4/w4DiZwRkD3uHJkwYgZ5CXw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=bBJdS4aK; 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="bBJdS4aK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id DBFC5C4CECE; Thu, 12 Dec 2024 16:56:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1734022598; bh=vtcnZCVY2j5Ckah5CPhaVqP7YTwy8t2Dd0PdTjn/AbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=bBJdS4aK7QUwK1Iu2/+ymwL6omPoUgKpvaj7n94xxYKRwoybd6kHHYtTJ5kp3P/bv LoOQeKx4N8n5eGXgwy+ed9+RQ/DHGeTnH6/4awK5Ak/eApsit4voyFOqvd18BYO3Ky 2iOj4YBG74y2X4CpWRmWfiDvoBaDqvtqQR3VeQ6A= 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.15 283/565] net: hsr: fix hsr_init_sk() vs network/transport headers. Date: Thu, 12 Dec 2024 15:57:58 +0100 Message-ID: <20241212144322.640439897@linuxfoundation.org> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20241212144311.432886635@linuxfoundation.org> References: <20241212144311.432886635@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.15-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 4a50ffc2a70c8..0ffb28406fdc0 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