From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794063194; b=z0VrccNpobaJaasRcbygLZC+G86Y+CQyHVPJwol+rYeAnoqArbSZ3S3y/f0PzJug4aKB BqQlw3m+Sykw6w/awYrSSPToJfXopy4FGSWWf9SB44DAdLTJtJyzn3+x8mrmN+kziCppx 5W5/40IJlqmi8hgMsPsoqd8HYCZ49bFDZKwlmc/qsfPNumYnz7fvDzp1O9FAB6wFXKPnR DajvP1UAYpDfenp7uLm5ZXomfHKMw0pWHXVq/WIz/hWlEe24rqqMCr8rjYDy+WgSLmUc7 Cn7axny5KsGDdVvc+xPbo6oH8Q38AwbUdJRhlRDgs8cnGBH4lR2SPCxj6lKYlWx0j2Q== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794063194; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:User-Agent:X-stable:X-Patchwork-Hint: MIME-Version:Content-Transfer-Encoding; bh=QDpDlHer/dAYWXH5N+SCd6Rng/3dXU08edizt8rXk9I=; b=WfI4+OAAz+UMYUNkwORdKDRkBRtgZ6qJjZ55ilQLC7ZOVKU+7Wf/cfAThJFrcRIsrXfB Sw1juKeubnv2CcyqArKa/ncW497p+xmK+GGkm/JCtSOSEUt1fhjqWXB8sN7esrsKHjbsy y8BKfCB9O36DDSiAIkD3ASqRBPOzwc9XRgs/1ctFjN2Bhd82KO4Sb+OUbaLrgekdT18ce EMo6uVgqIYDLUZBDAq8uYC8yKwXat0USFfkqHHNVzgaVKM1owlHNa5SO9ALSzfnin/Dzg SmSQDV8I0A2wJJ74NDttFip44aujBAewT68lSOj4nREFeTytyp++6PWfk9XJN5I6TCg== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=2SwlCmYG; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C685E606D81F; Sat, 7 Nov 2026 14:53:13 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.a=rsa-sha256 header.s=korg header.b=2SwlCmYG Received: by smtp.kernel.org (Postfix) with ESMTPSA id 609E01F0089F; Sat, 7 Nov 2026 14:53:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1794063193; bh=QDpDlHer/dAYWXH5N+SCd6Rng/3dXU08edizt8rXk9I=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=2SwlCmYGcagqp/g82709alkOt0zwIUkxWUCLwTZfj7Zdi4a6RhY/E/C95ximcDUzH E9LS4kF3t5y/pTzZ3UiOwzdC6Y8WN4Ayyy9yeMRW9QETxV2+FOY6aO+dI9wpaE3RNl GENoVCrtMTeFX+/x4H38oyPIpBfKmk5/2RfS74ng= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Josef Bacik , Jens Axboe , Sasha Levin Subject: [PATCH 6.18 409/869] aoe: pull in the headers each received packet type reads Date: Sat, 7 Nov 2026 08:51:31 -0500 Message-ID: <20261107134907.216133918@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261107134852.069646174@linuxfoundation.org> References: <20261107134852.069646174@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Josef Bacik [ Upstream commit e1274a6bc40a4618f6fbaebbdc51cca865d51bed ] aoenet_rcv() only pulls the AoE and ATA headers into the skb head when the packet is long enough to hold both. A shorter packet goes through unpulled, and aoenet_rcv() reads the AoE header from it anyway. CFG responses go on to aoecmd_cfg_rsp(), which reads the config header after it, and ATA responses get queued for ktiocomplete(), which skb_pull()s both headers. Ethernet pads frames to 60 bytes, so this mostly takes a virtual link, but nothing stops a short frame from getting here. Pull the AoE header up front and drop the packet if it isn't there, then pull the ATA or config header in the switch arm that hands the packet on, so each path gets the headers it reads. This also replaces the open-coded __pskb_pull_tail() with pskb_may_pull(). Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Cc: stable@vger.kernel.org Assisted-by: LLM Signed-off-by: Josef Bacik Link: https://patch.msgid.link/20261007-b4-aoe-short-packets-v1-1-db5155f7bb9c@toxicpanda.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/aoe/aoenet.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/drivers/block/aoe/aoenet.c b/drivers/block/aoe/aoenet.c index 66e617664c143..cd7c735bb43b7 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c @@ -131,9 +131,7 @@ static int aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, struct net_device *orig_dev) { struct aoe_hdr *h; - struct aoe_atahdr *ah; u32 n; - int sn; if (dev_net(ifp) != &init_net) goto exit; @@ -144,12 +142,8 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, if (!is_aoe_netif(ifp)) goto exit; skb_push(skb, ETH_HLEN); /* (1) */ - sn = sizeof(*h) + sizeof(*ah); - if (skb->len >= sn) { - sn -= skb_headlen(skb); - if (sn > 0 && !__pskb_pull_tail(skb, sn)) - goto exit; - } + if (!pskb_may_pull(skb, sizeof(*h))) + goto exit; h = (struct aoe_hdr *) skb->data; n = get_unaligned_be32(&h->tag); if ((h->verfl & AOEFL_RSP) == 0 || (n & 1<<31)) @@ -171,10 +165,14 @@ aoenet_rcv(struct sk_buff *skb, struct net_device *ifp, struct packet_type *pt, switch (h->cmd) { case AOECMD_ATA: + if (!pskb_may_pull(skb, sizeof(*h) + sizeof(struct aoe_atahdr))) + goto exit; /* ata_rsp may keep skb for later processing or give it back */ skb = aoecmd_ata_rsp(skb); break; case AOECMD_CFG: + if (!pskb_may_pull(skb, sizeof(*h) + sizeof(struct aoe_cfghdr))) + goto exit; aoecmd_cfg_rsp(skb); break; default: -- 2.53.0