[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 07/14] dp8393x: Implement packet size limit and RBAE interrupt
From: |
Finn Thain |
Subject: |
[PATCH v4 07/14] dp8393x: Implement packet size limit and RBAE interrupt |
Date: |
Wed, 29 Jan 2020 20:27:49 +1100 |
Add a bounds check to prevent a large packet from causing a buffer
overflow. This is defensive programming -- I haven't actually tried
sending an oversized packet or a jumbo ethernet frame.
The SONIC handles packets that are too big for the buffer by raising
the RBAE interrupt and dropping them. Linux uses that interrupt to
count dropped packets.
Signed-off-by: Finn Thain <address@hidden>
Tested-by: Laurent Vivier <address@hidden>
---
Changed since v1:
- Perform length check after Recieve Control Register initialization.
---
hw/net/dp8393x.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/hw/net/dp8393x.c b/hw/net/dp8393x.c
index 2e976781e2..0309365fda 100644
--- a/hw/net/dp8393x.c
+++ b/hw/net/dp8393x.c
@@ -137,6 +137,7 @@ do { printf("sonic ERROR: %s: " fmt, __func__ , ##
__VA_ARGS__); } while (0)
#define SONIC_TCR_CRCI 0x2000
#define SONIC_TCR_PINT 0x8000
+#define SONIC_ISR_RBAE 0x0010
#define SONIC_ISR_RBE 0x0020
#define SONIC_ISR_RDE 0x0040
#define SONIC_ISR_TC 0x0080
@@ -770,6 +771,14 @@ static ssize_t dp8393x_receive(NetClientState *nc, const
uint8_t * buf,
s->regs[SONIC_RCR] &= ~(SONIC_RCR_PRX | SONIC_RCR_LBK | SONIC_RCR_FAER |
SONIC_RCR_CRCR | SONIC_RCR_LPKT | SONIC_RCR_BC | SONIC_RCR_MC);
+ if (pkt_size + 4 > dp8393x_rbwc(s) * 2) {
+ DPRINTF("oversize packet, pkt_size is %d\n", pkt_size);
+ s->regs[SONIC_ISR] |= SONIC_ISR_RBAE;
+ dp8393x_update_irq(s);
+ dp8393x_do_read_rra(s);
+ return pkt_size;
+ }
+
packet_type = dp8393x_receive_filter(s, buf, pkt_size);
if (packet_type < 0) {
DPRINTF("packet not for netcard\n");
--
2.24.1
- [PATCH v4 00/14] Fixes for DP8393X SONIC device emulation, Finn Thain, 2020/01/29
- [PATCH v4 08/14] dp8393x: Don't clobber packet checksum, Finn Thain, 2020/01/29
- [PATCH v4 06/14] dp8393x: Clear RRRA command register bit only when appropriate, Finn Thain, 2020/01/29
- [PATCH v4 04/14] dp8393x: Have dp8393x_receive() return the packet size, Finn Thain, 2020/01/29
- [PATCH v4 10/14] dp8393x: Pad frames to word or long word boundary, Finn Thain, 2020/01/29
- [PATCH v4 09/14] dp8393x: Use long-word-aligned RRA pointers in 32-bit mode, Finn Thain, 2020/01/29
- [PATCH v4 02/14] dp8393x: Always use 32-bit accesses, Finn Thain, 2020/01/29
- [PATCH v4 14/14] dp8393x: Don't stop reception upon RBE interrupt assertion, Finn Thain, 2020/01/29
- [PATCH v4 05/14] dp8393x: Update LLFA and CRDA registers from rx descriptor, Finn Thain, 2020/01/29
- [PATCH v4 07/14] dp8393x: Implement packet size limit and RBAE interrupt,
Finn Thain <=
- [PATCH v4 11/14] dp8393x: Clear descriptor in_use field to release packet, Finn Thain, 2020/01/29
- [PATCH v4 13/14] dp8393x: Don't reset Silicon Revision register, Finn Thain, 2020/01/29
- [PATCH v4 01/14] dp8393x: Mask EOL bit from descriptor addresses, Finn Thain, 2020/01/29
- [PATCH v4 03/14] dp8393x: Clean up endianness hacks, Finn Thain, 2020/01/29
- [PATCH v4 12/14] dp8393x: Always update RRA pointers and sequence numbers, Finn Thain, 2020/01/29