Commit 62e0ae0f authored by Grant Grundler's avatar Grant Grundler Committed by David S. Miller

net: atlantic: fix "frag[0] not initialized"

In aq_ring_rx_clean(), if buff->is_eop is not set AND
buff->len < AQ_CFG_RX_HDR_SIZE, then hdr_len remains equal to
buff->len and skb_add_rx_frag(xxx, *0*, ...) is not called.

The loop following this code starts calling skb_add_rx_frag() starting
with i=1 and thus frag[0] is never initialized. Since i is initialized
to zero at the top of the primary loop, we can just reference and
post-increment i instead of hardcoding the 0 when calling
skb_add_rx_frag() the first time.
Reported-by: default avatarAashay Shringarpure <aashay@google.com>
Reported-by: default avatarYi Chou <yich@google.com>
Reported-by: default avatarShervin Oloumi <enlightened@google.com>
Signed-off-by: default avatarGrant Grundler <grundler@chromium.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0807ce0b
...@@ -446,7 +446,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self, ...@@ -446,7 +446,7 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
ALIGN(hdr_len, sizeof(long))); ALIGN(hdr_len, sizeof(long)));
if (buff->len - hdr_len > 0) { if (buff->len - hdr_len > 0) {
skb_add_rx_frag(skb, 0, buff->rxdata.page, skb_add_rx_frag(skb, i++, buff->rxdata.page,
buff->rxdata.pg_off + hdr_len, buff->rxdata.pg_off + hdr_len,
buff->len - hdr_len, buff->len - hdr_len,
AQ_CFG_RX_FRAME_MAX); AQ_CFG_RX_FRAME_MAX);
...@@ -455,7 +455,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self, ...@@ -455,7 +455,6 @@ int aq_ring_rx_clean(struct aq_ring_s *self,
if (!buff->is_eop) { if (!buff->is_eop) {
buff_ = buff; buff_ = buff;
i = 1U;
do { do {
next_ = buff_->next; next_ = buff_->next;
buff_ = &self->buff_ring[next_]; buff_ = &self->buff_ring[next_];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment