mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
qede: fix off-by-one in BD ring consumption on build_skb failure
[ Upstream commita0a558ca7e] 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. Commit4e910dbe36("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:8a8633978b("qede: Add build_skb() support.") Signed-off-by: Shigeru Yoshida <syoshida@redhat.com> Reviewed-by: Jamie Bainbridge <jamie.bainbridge@gmail.com> Link: https://patch.msgid.link/20260630164623.3152625-1-syoshida@redhat.com Signed-off-by: Paolo Abeni <pabeni@redhat.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
786456d0a2
commit
0bf78df2d3
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user