diff options
| author | Patrick Kelsey <pkelsey@FreeBSD.org> | 2020-03-14 19:43:44 +0000 |
|---|---|---|
| committer | Patrick Kelsey <pkelsey@FreeBSD.org> | 2020-03-14 19:43:44 +0000 |
| commit | 9e9b738ac5dc5b5bca1a4de3b03fd4d072261adc (patch) | |
| tree | a70d27bd3529cf0616deb84d6ee525b24f409466 /sys/net/iflib.c | |
| parent | 30b5d9be24ec13157d18ae9bf01ef964f8187998 (diff) | |
| download | src-9e9b738ac5dc5b5bca1a4de3b03fd4d072261adc.tar.gz src-9e9b738ac5dc5b5bca1a4de3b03fd4d072261adc.zip | |
Fix iflib freelist state corruption
This fixes a bug in iflib freelist management that breaks the required
correspondence between freelist indexes and driver ring slots.
PR: 243126, 243392, 240628
Reported by: avg, alexandr.oleynikov@gmail.com, Harald Schmalzbauer
Reviewed by: avg, gallatin
MFC after: 1 week
Differential Revision: https://reviews.freebsd.org/D23943
Notes
Notes:
svn path=/head/; revision=358995
Diffstat (limited to 'sys/net/iflib.c')
| -rw-r--r-- | sys/net/iflib.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 30c09a7d43ad..86149ee18089 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -2072,7 +2072,9 @@ _iflib_fl_refill(if_ctx_t ctx, iflib_fl_t fl, int count) bus_dmamap_sync(fl->ifl_ifdi->idi_tag, fl->ifl_ifdi->idi_map, BUS_DMASYNC_PREREAD | BUS_DMASYNC_PREWRITE); ctx->isc_rxd_flush(ctx->ifc_softc, fl->ifl_rxq->ifr_id, fl->ifl_id, pidx); - fl->ifl_fragidx = frag_idx; + fl->ifl_fragidx = frag_idx + 1; + if (fl->ifl_fragidx == fl->ifl_size) + fl->ifl_fragidx = 0; return (n == -1 ? 0 : IFLIB_RXEOF_EMPTY); } |