Skip to content

Commit 706511d

Browse files
committed
pipes: don't try to access kring->pipe on host rings
1 parent b66f81b commit 706511d

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

sys/dev/netmap/netmap_pipe.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff)
390390
ND("%p: onoff %d", na, onoff);
391391
if (onoff) {
392392
for_rx_tx(t) {
393-
for (i = 0; i < nma_get_nrings(na, t) + 1; i++) {
393+
for (i = 0; i < nma_get_nrings(na, t); i++) {
394394
struct netmap_kring *kring = &NMR(na, t)[i];
395395

396396
if (nm_kring_pending_on(kring)) {
@@ -429,7 +429,9 @@ netmap_pipe_reg(struct netmap_adapter *na, int onoff)
429429
/* mark the peer ring as no longer needed by us
430430
* (it may still be kept if sombody else is using it)
431431
*/
432-
kring->pipe->nr_kflags &= ~NKR_NEEDRING;
432+
if (kring->pipe) {
433+
kring->pipe->nr_kflags &= ~NKR_NEEDRING;
434+
}
433435
}
434436
}
435437
}

0 commit comments

Comments
 (0)