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=1795045367; b=LZe4ocq9ID4ERTekVqJlJW92DAHrcwjkAuFMCruILFxeJnOaXbYbk3KJxS39XRy0T9MS 8hnw1PhY9L8FDTWkCU6+qvOvc5H0CJQVEGWgiQPQqUW/5fjjC5aT4gAkbl2w0Pv81Zm1M lJOEccxSQ2ABNTHaoJ2fXKXsze5xehNqpV3Ena4d0rj/3NrSEZOUPbWzNGPem+wMxgobt D/MF8CwYyNA6m43wFp3zPZN/YmQZvUHM0+a6BraWB2UIad1jqtOfTPxvfA82tMRIt/3g7 Lqc1FuS23tJB3PXk/qIXNKACQLUobR3Dpiz7DqQy5E7V62n3ALVARDYKVWywl7esntQ== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1795045367; 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=lWq75u495mog8mUjrRbg04CMuJFzSgobBvrMMb5F+nA=; b=G0ggpAkL5g9z3iRk2sM8/6EnsZc3PHM7eVu5mIYTCSfe2+5/FwpRrbvSdUG+5fK68EZi 5/lARTI2VHAPMjFaztQ+8eyYuhXFEX0mfu+yF4KGywQJM1R67/qX2Lfjg9hmybkCKaJRR xdfR6fIImPiBS6gclkYKRtyNAXuAg1RzaASrX1Oy0nFbKWksfU2PWDRDO65MSfwmhL54w vndR53Ff7+M74mCtEGY6dclUpV5roW43Wc+dkxOnm6fODbcq1y0MTtMsgkATvnKoXKDos oPYwiI8RJ08WpVyoevBy9o2Sdw2g7Q16myiCzGh2sZyxDyEa+nmjFWVdTDqtcQ5FQkQ== 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=lko44fu5; 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 4396E60A2619; Wed, 18 Nov 2026 23:42:47 +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=lko44fu5 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 957BC1F000C4; Wed, 18 Nov 2026 23:42:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1795045367; bh=lWq75u495mog8mUjrRbg04CMuJFzSgobBvrMMb5F+nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=lko44fu5sWSLIT5bwpEZANlwsWhJTgviG5FbOT+0p61hPAnXuDjnUoAJMzkWuAL5C 0gdRkZh3bdTf/18KL8yx2J62lCy90g2N1+iJ4U1zsR4zeld+OnaGtPQiRId8UDCtuH 5TzJ5UlOS6CowKy3kVuOSE3LtxURavMxNUrb4h+o= 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.1 0899/2857] aoe: pull in the headers each received packet type reads Date: Wed, 18 Nov 2026 15:32:13 +0100 Message-ID: <20261118150233.930854464@linuxfoundation.org> X-Mailer: git-send-email 2.56.0 In-Reply-To: <20261118150201.293410965@linuxfoundation.org> References: <20261118150201.293410965@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.1-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 1e66c7a188a12..03bc1ca3ad472 100644 --- a/drivers/block/aoe/aoenet.c +++ b/drivers/block/aoe/aoenet.c @@ -132,9 +132,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; @@ -145,12 +143,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)) @@ -172,10 +166,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