Page MenuHomeFreeBSD
Files F154319875

D54157.id167806.diff
No OneTemporary
Actions

D54157.id167806.diff
View Options

diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1726,6 +1726,10 @@
error = EBUSY;
if (error != 0) {
SOCK_UNLOCK(so2);
+ mtx_lock(&sp->mtx);
+ sp->dst = NULL;
+ sp->state = SPLICE_EXCEPTION;
+ mtx_unlock(&sp->mtx);
so_unsplice(so, false);
return (error);
}
@@ -1733,6 +1737,10 @@
if (so->so_snd.sb_tls_info != NULL) {
SOCK_SENDBUF_UNLOCK(so2);
SOCK_UNLOCK(so2);
+ mtx_lock(&sp->mtx);
+ sp->dst = NULL;
+ sp->state = SPLICE_EXCEPTION;
+ mtx_unlock(&sp->mtx);
so_unsplice(so, false);
return (EINVAL);
}
@@ -1799,20 +1807,20 @@
SOCK_UNLOCK(so);
so2 = sp->dst;
- SOCK_LOCK(so2);
- KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__));
- SOCK_SENDBUF_LOCK(so2);
- KASSERT(sp->state == SPLICE_INIT ||
- (so2->so_snd.sb_flags & SB_SPLICED) != 0,
- ("%s: so2 is not spliced", __func__));
- KASSERT(sp->state == SPLICE_INIT ||
- so2->so_splice_back == sp,
- ("%s: so_splice_back != sp", __func__));
- so2->so_snd.sb_flags &= ~SB_SPLICED;
- so2rele = so2->so_splice_back != NULL;
- so2->so_splice_back = NULL;
- SOCK_SENDBUF_UNLOCK(so2);
- SOCK_UNLOCK(so2);
+ if (so2 != NULL) {
+ SOCK_LOCK(so2);
+ KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__));
+ SOCK_SENDBUF_LOCK(so2);
+ KASSERT((so2->so_snd.sb_flags & SB_SPLICED) != 0,
+ ("%s: so2 is not spliced", __func__));
+ KASSERT(so2->so_splice_back == sp,
+ ("%s: so_splice_back != sp", __func__));
+ so2->so_snd.sb_flags &= ~SB_SPLICED;
+ so2rele = so2->so_splice_back != NULL;
+ so2->so_splice_back = NULL;
+ SOCK_SENDBUF_UNLOCK(so2);
+ SOCK_UNLOCK(so2);
+ }
/*
* No new work is being enqueued. The worker thread might be
@@ -1852,9 +1860,11 @@
sorwakeup(so);
CURVNET_SET(so->so_vnet);
sorele(so);
- sowwakeup(so2);
- if (so2rele)
- sorele(so2);
+ if (so2 != NULL) {
+ sowwakeup(so2);
+ if (so2rele)
+ sorele(so2);
+ }
CURVNET_RESTORE();
so_splice_free(sp);
return (0);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 7:54 PM (12 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32302369
Default Alt Text
D54157.id167806.diff (1 KB)

Event Timeline