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/kern/uipc_sockbuf.c | |
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/kern/uipc_sockbuf.c')
-rw-r--r-- | sys/kern/uipc_sockbuf.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index b5ecdb99b59b..cf53f234d8fc 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -436,30 +436,6 @@ socantrcvmore(struct socket *so) mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); } -void -soroverflow_locked(struct socket *so) -{ - - SOCKBUF_LOCK_ASSERT(&so->so_rcv); - - if (so->so_options & SO_RERROR) { - so->so_rerror = ENOBUFS; - sorwakeup_locked(so); - } else - SOCKBUF_UNLOCK(&so->so_rcv); - - mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); -} - -void -soroverflow(struct socket *so) -{ - - SOCKBUF_LOCK(&so->so_rcv); - soroverflow_locked(so); - mtx_assert(SOCKBUF_MTX(&so->so_rcv), MA_NOTOWNED); -} - /* * Wait for data to arrive at/drain from a socket buffer. */ |