diff options
author | mav <mav@FreeBSD.org> | 2016-08-18 09:25:10 +0000 |
---|---|---|
committer | mav <mav@FreeBSD.org> | 2016-08-18 09:25:10 +0000 |
commit | 38cd3c3b799639d69fa005711586a1c3f12f9d1e (patch) | |
tree | 944c75621a3dcdf9c0fb0ffc009af29caf52f908 | |
parent | d13b86383cbf9fa95c76cdc698c2d5976e576e3c (diff) | |
download | FreeBSD-src-38cd3c3b799639d69fa005711586a1c3f12f9d1e.zip FreeBSD-src-38cd3c3b799639d69fa005711586a1c3f12f9d1e.tar.gz |
MFC r302495: Improve memory allocation errors handling on receive.
-rw-r--r-- | sys/dev/ntb/if_ntb/if_ntb.c | 7 | ||||
-rw-r--r-- | sys/dev/ntb/ntb_transport.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/ntb/if_ntb/if_ntb.c b/sys/dev/ntb/if_ntb/if_ntb.c index d592e09..4c09149 100644 --- a/sys/dev/ntb/if_ntb/if_ntb.c +++ b/sys/dev/ntb/if_ntb/if_ntb.c @@ -241,7 +241,12 @@ ntb_net_rx_handler(struct ntb_transport_qp *qp, void *qp_data, void *data, struct mbuf *m = data; struct ifnet *ifp = qp_data; - CTR0(KTR_NTB, "RX: rx handler"); + CTR1(KTR_NTB, "RX: rx handler (%d)", len); + if (len < 0) { + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); + return; + } + m->m_pkthdr.csum_flags = CSUM_IP_CHECKED | CSUM_IP_VALID; (*ifp->if_input)(ifp, m); } diff --git a/sys/dev/ntb/ntb_transport.c b/sys/dev/ntb/ntb_transport.c index 8564744..2e7ad2f 100644 --- a/sys/dev/ntb/ntb_transport.c +++ b/sys/dev/ntb/ntb_transport.c @@ -877,6 +877,8 @@ ntb_memcpy_rx(struct ntb_transport_qp *qp, struct ntb_queue_entry *entry, CTR2(KTR_NTB, "RX: copying %d bytes from offset %p", len, offset); entry->buf = (void *)m_devget(offset, len, 0, ifp, NULL); + if (entry->buf == NULL) + entry->len = -ENOMEM; /* Ensure that the data is globally visible before clearing the flag */ wmb(); |