Skip to contentSkip to conversation

net: ethernet: dec: tulip: Fix length mask in receive length calculation

PATCH Applied Moritz Fischer 2 participants 2 messages Feb 4, 2020 – Feb 5, 2020

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 net: ethernet: dec: tulip: Fix length mask in receive length calculation

The receive frame length calculation uses a wrong mask to calculate the length of the received frames.

Per spec table 4-1 the length is contained in the FL (Frame Length) field in bits 30:16.

This didn't show up as an issue so far since frames were limited to 1500 bytes which falls within the 11 bit window.

---
 drivers/net/ethernet/dec/tulip/de2104x.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/ethernet/dec/tulip/de2104x.c +4 -1
index d305d1b24b0a..42b798a3fad4 100644
@@ -417,7 +417,10 @@ static void de_rx (struct de_private *de)
 		if (status & DescOwn)
 			break;
 
-		len = ((status >> 16) & 0x7ff) - 4;
+		/* the length is actually a 15 bit value here according
+		 * to Table 4-1 in the DE2104x spec so mask is 0x7fff
+		 */
+		len = ((status >> 16) & 0x7fff) - 4;
 		mapping = de->rx_skb[rx_tail].mapping;
 
 		if (unlikely(drop)) {
Signature · 1 line
2.25.0
maintainer Applied
#1 lore raw

From: Moritz Fischer <[email protected]>
Date: Tue, 4 Feb 2020 15:01:18 -0800

Quoted 10 lines

The receive frame length calculation uses a wrong mask to calculate the length of the received frames.

Per spec table 4-1 the length is contained in the FL (Frame Length) field in bits 30:16.

This didn't show up as an issue so far since frames were limited to 1500 bytes which falls within the 11 bit window.

Applied, thanks.