raspi/linux
1
0
Fork 1
mirror of https://github.com/raspberrypi/linux.git synced 2025-12-06 10:00:17 +00:00
Code Issues Projects Releases Wiki Activity

net: atlantic: add check for MAX_SKB_FRAGS

Browse Source 
Enforce that the CPU can not get stuck in an infinite loop.

Reported-by: Aashay Shringarpure <aashay@google.com>
Reported-by: Yi Chou <yich@google.com>
Reported-by: Shervin Oloumi <enlightened@google.com>
Signed-off-by: Grant Grundler <grundler@chromium.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Grant Grundler
2022-05-09 19:28:25 -07:00
committed by David S. Miller
parent 79784d77eb
commit 6aecbba12b
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/net/ethernet/aquantia/atlantic/aq_ring.c
View File

@@ -363,6 +363,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
continue; continue;
if (!buff->is_eop) { if (!buff->is_eop) {
unsigned int frag_cnt = 0U;
buff_ = buff; buff_ = buff;
do { do {
bool is_rsc_completed = true; bool is_rsc_completed = true;
@@ -371,6 +372,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
err = -EIO; err = -EIO;
goto err_exit; goto err_exit;
} }
frag_cnt++;
next_ = buff_->next, next_ = buff_->next,
buff_ = &self->buff_ring[next_]; buff_ = &self->buff_ring[next_];
is_rsc_completed = is_rsc_completed =
@@ -378,7 +381,8 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
next_, next_,
self->hw_head); self->hw_head);
if (unlikely(!is_rsc_completed)) { if (unlikely(!is_rsc_completed) ||
frag_cnt > MAX_SKB_FRAGS) {
err = 0; err = 0;
goto err_exit; goto err_exit;
} }