aboutsummaryrefslogtreecommitdiff
path: root/sys/netipsec/keysock.c
diff options
context:
space:
mode:
authorAlexander V. Chernikov <melifaro@FreeBSD.org>2021-02-08 22:30:39 +0000
committerAlexander V. Chernikov <melifaro@FreeBSD.org>2021-02-08 22:32:32 +0000
commit924d1c9a050d7e355d0562fca62bd2bb9b5f53d7 (patch)
tree64fc9716256a1d641aeba3256a4fc2c174b52174 /sys/netipsec/keysock.c
parentdb2f512381ac3c0c227f5c0354690bb929dcac17 (diff)
downloadsrc-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/netipsec/keysock.c')
-rw-r--r--sys/netipsec/keysock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/sys/netipsec/keysock.c b/sys/netipsec/keysock.c
index 7a0b9e757022..49efa0a3c510 100644
--- a/sys/netipsec/keysock.c
+++ b/sys/netipsec/keysock.c
@@ -141,6 +141,7 @@ end:
static int
key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc)
{
+ int error;
if (promisc) {
struct sadb_msg *pmsg;
@@ -164,12 +165,11 @@ key_sendup0(struct rawcb *rp, struct mbuf *m, int promisc)
m, NULL)) {
PFKEYSTAT_INC(in_nomem);
m_freem(m);
- soroverflow(rp->rcb_socket);
- return ENOBUFS;
- }
-
+ error = ENOBUFS;
+ } else
+ error = 0;
sorwakeup(rp->rcb_socket);
- return 0;
+ return error;
}
/* so can be NULL if target != KEY_SENDUP_ONE */