Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 30065400E17; Tue, 21 Jul 2026 18:23:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658186; cv=none; b=BkAlqRH1hvoQMo41w36UUgfgjLskiGJk/wQH0TrxwCxQMepfCtE8fDoER5WPNc8xKSKMZLwT2i6qhW7tdlxmP3JoWmMevx/Rs0tXg/DwIxxjBYFZIetX+LkWdW6Lpe1M/lVhJayYT7Anj2XK5oinRXRFBJXAFSNQsU0VBYxZPGg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658186; c=relaxed/simple; bh=9LVNOD8P+dVqTI/7vhPv9zRXk2rH9nVC2/z6jOdz1CQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fLGZRwaPkB6XiOvTFtu4mb49nNtyeYt3GxwAv2YM0WVtsKW9cNgbCu0NWCRmVsEZPDth5kz7a+Xp/cG7SR8KeBTPfvX1+81LezsBZj2C48UYsWxzehpM3b9MKdieaUbccPFGrUt1vzItvGCVhS/rURRNkevF/QEkOsH2DtZhHow= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Qq5ZQPHx; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="Qq5ZQPHx" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 95D4F1F000E9; Tue, 21 Jul 2026 18:23:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784658185; bh=8r1EUCv5kMxi3K93Wl6ohy8AJ/dL3NThdSVmcUHdhJY=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Qq5ZQPHx1ZXfG1BL1sRX671vRMLVdyTxnThROgEEdUjwNlwgBDPdAOtplotK9nzrN UTpdmRTC1xwSKn2IztqLZioyHCye/NIr13/ozlBNFLXMEnHGr6IWG0vPvh4e78IhOW JEDP3JQF4MYl+p1eIw+cEdWlSNNfEmmuH4nIpIjI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Shigeru Yoshida , Jamie Bainbridge , Paolo Abeni , Sasha Levin Subject: [PATCH 6.18 1048/1611] qede: fix off-by-one in BD ring consumption on build_skb failure Date: Tue, 21 Jul 2026 17:19:24 +0200 Message-ID: <20260721152538.979980275@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Shigeru Yoshida [ Upstream commit a0a558ca7e75b49e71f8c545c30e8c005e6e4e2f ] qede_rx_build_skb() and qede_tpa_rx_build_skb() do not check for a NULL return from qede_build_skb(). When it returns NULL under memory pressure, the functions still consume a BD from the ring before returning NULL. The callers then recycle additional BDs, resulting in one extra BD being consumed (off-by-one). This desynchronizes the BD ring, which can corrupt DMA page reference counts and lead to SLUB freelist corruption. Commit 4e910dbe3650 ("qede: confirm skb is allocated before using") added a NULL check inside qede_build_skb() to prevent a NULL pointer dereference, but did not address the missing NULL checks in the callers, making this off-by-one reachable. Fix this by adding NULL checks for the return value of qede_build_skb() in both qede_rx_build_skb() and qede_tpa_rx_build_skb(), returning NULL immediately before any BD ring manipulation. Fixes: 8a8633978b84 ("qede: Add build_skb() support.") Signed-off-by: Shigeru Yoshida Reviewed-by: Jamie Bainbridge Link: https://patch.msgid.link/20260630164623.3152625-1-syoshida@redhat.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/ethernet/qlogic/qede/qede_fp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index 33e18bb6977401..c11e0d8f98aa5c 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -765,6 +765,9 @@ qede_tpa_rx_build_skb(struct qede_dev *edev, struct sk_buff *skb; skb = qede_build_skb(rxq, bd, len, pad); + if (unlikely(!skb)) + return NULL; + bd->page_offset += rxq->rx_buf_seg_size; if (bd->page_offset == PAGE_SIZE) { @@ -812,6 +815,8 @@ qede_rx_build_skb(struct qede_dev *edev, } skb = qede_build_skb(rxq, bd, len, pad); + if (unlikely(!skb)) + return NULL; if (unlikely(qede_realloc_rx_buffer(rxq, bd))) { /* Incr page ref count to reuse on allocation failure so -- 2.53.0