diff options
| author | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-02-08 22:30:39 +0000 |
|---|---|---|
| committer | Alexander V. Chernikov <melifaro@FreeBSD.org> | 2021-02-08 22:32:32 +0000 |
| commit | 924d1c9a050d7e355d0562fca62bd2bb9b5f53d7 (patch) | |
| tree | 64fc9716256a1d641aeba3256a4fc2c174b52174 /sys/netgraph | |
| parent | db2f512381ac3c0c227f5c0354690bb929dcac17 (diff) | |
| download | src-924d1c9a050d7e355d0562fca62bd2bb9b5f53d7.tar.gz src-924d1c9a050d7e355d0562fca62bd2bb9b5f53d7.zip | |
Revert "SO_RERROR indicates that receive buffer overflows should be handled as errors."
Wrong version of the change was pushed inadvertenly.
This reverts commit 4a01b854ca5c2e5124958363b3326708b913af71.
Diffstat (limited to 'sys/netgraph')
| -rw-r--r-- | sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 1 | ||||
| -rw-r--r-- | sys/netgraph/ng_socket.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c index c82515f82631..5f6b98d03359 100644 --- a/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c +++ b/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c @@ -539,7 +539,6 @@ ng_btsocket_hci_raw_data_input(struct mbuf *nam) NG_FREE_M(m); NG_FREE_M(ctl); - soroverflow(pcb->so); } } next: diff --git a/sys/netgraph/ng_socket.c b/sys/netgraph/ng_socket.c index 905567c86b47..865e9dd7948f 100644 --- a/sys/netgraph/ng_socket.c +++ b/sys/netgraph/ng_socket.c @@ -982,7 +982,7 @@ ngs_rcvmsg(node_p node, item_p item, hook_p lasthook) /* Send it up to the socket. */ if (sbappendaddr_locked(&so->so_rcv, (struct sockaddr *)&addr, m, NULL) == 0) { - soroverflow_locked(so); + SOCKBUF_UNLOCK(&so->so_rcv); TRAP_ERROR; m_freem(m); return (ENOBUFS); |