Page MenuHomeFreeBSD
Files F154217584

D49920.id.diff
No OneTemporary
Actions

D49920.id.diff
View Options

diff --git a/sys/kern/uipc_ktls.c b/sys/kern/uipc_ktls.c
--- a/sys/kern/uipc_ktls.c
+++ b/sys/kern/uipc_ktls.c
@@ -1332,7 +1332,11 @@
/* Mark the socket as using TLS offload. */
SOCK_RECVBUF_LOCK(so);
- if (__predict_false(so->so_rcv.sb_tls_info != NULL)) {
+ if (__predict_false(so->so_rcv.sb_tls_info != NULL))
+ error = EALREADY;
+ else if ((so->so_rcv.sb_flags & SB_SPLICED) != 0)
+ error = EINVAL;
+ if (error != 0) {
SOCK_RECVBUF_UNLOCK(so);
SOCK_IO_RECV_UNLOCK(so);
ktls_free(tls);
@@ -1432,12 +1436,16 @@
inp = so->so_pcb;
INP_WLOCK(inp);
SOCK_SENDBUF_LOCK(so);
- if (__predict_false(so->so_snd.sb_tls_info != NULL)) {
+ if (__predict_false(so->so_snd.sb_tls_info != NULL))
+ error = EALREADY;
+ else if ((so->so_snd.sb_flags & SB_SPLICED) != 0)
+ error = EINVAL;
+ if (error != 0) {
SOCK_SENDBUF_UNLOCK(so);
INP_WUNLOCK(inp);
SOCK_IO_SEND_UNLOCK(so);
ktls_free(tls);
- return (EALREADY);
+ return (error);
}
so->so_snd.sb_tls_seqno = be64dec(en->rec_seq);
so->so_snd.sb_tls_info = tls;
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
@@ -1699,10 +1699,16 @@
uma_zfree(splice_zone, sp);
return (error);
}
- soref(so);
- so->so_splice = sp;
SOCK_RECVBUF_LOCK(so);
+ if (so->so_rcv.sb_tls_info != NULL) {
+ SOCK_RECVBUF_UNLOCK(so);
+ SOCK_UNLOCK(so);
+ uma_zfree(splice_zone, sp);
+ return (EINVAL);
+ }
so->so_rcv.sb_flags |= SB_SPLICED;
+ so->so_splice = sp;
+ soref(so);
SOCK_RECVBUF_UNLOCK(so);
SOCK_UNLOCK(so);
@@ -1716,20 +1722,19 @@
error = EBUSY;
if (error != 0) {
SOCK_UNLOCK(so2);
- SOCK_LOCK(so);
- so->so_splice = NULL;
- SOCK_RECVBUF_LOCK(so);
- so->so_rcv.sb_flags &= ~SB_SPLICED;
- SOCK_RECVBUF_UNLOCK(so);
- SOCK_UNLOCK(so);
- sorele(so);
- uma_zfree(splice_zone, sp);
+ so_unsplice(so, false);
return (error);
}
- soref(so2);
- so2->so_splice_back = sp;
SOCK_SENDBUF_LOCK(so2);
+ if (so->so_snd.sb_tls_info != NULL) {
+ SOCK_SENDBUF_UNLOCK(so2);
+ SOCK_UNLOCK(so2);
+ so_unsplice(so, false);
+ return (EINVAL);
+ }
so2->so_snd.sb_flags |= SB_SPLICED;
+ so2->so_splice_back = sp;
+ soref(so2);
mtx_lock(&sp->mtx);
SOCK_SENDBUF_UNLOCK(so2);
SOCK_UNLOCK(so2);
@@ -1754,7 +1759,7 @@
{
struct socket *so2;
struct so_splice *sp;
- bool drain;
+ bool drain, so2rele;
/*
* First unset SB_SPLICED and hide the splice structure so that
@@ -1793,11 +1798,14 @@
SOCK_LOCK(so2);
KASSERT(!SOLISTENING(so2), ("%s: so2 is listening", __func__));
SOCK_SENDBUF_LOCK(so2);
- KASSERT((so2->so_snd.sb_flags & SB_SPLICED) != 0,
+ KASSERT(sp->state == SPLICE_INIT ||
+ (so2->so_snd.sb_flags & SB_SPLICED) != 0,
("%s: so2 is not spliced", __func__));
- KASSERT(so2->so_splice_back == sp,
+ 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);
@@ -1815,6 +1823,7 @@
while (sp->state == SPLICE_CLOSING)
msleep(sp, &sp->mtx, PSOCK, "unsplice", 0);
break;
+ case SPLICE_INIT:
case SPLICE_IDLE:
case SPLICE_EXCEPTION:
sp->state = SPLICE_CLOSED;
@@ -1840,7 +1849,8 @@
CURVNET_SET(so->so_vnet);
sorele(so);
sowwakeup(so2);
- sorele(so2);
+ if (so2rele)
+ sorele(so2);
CURVNET_RESTORE();
so_splice_free(sp);
return (0);

File Metadata

Mime Type
text/plain
Expires
Tue, Apr 28, 5:00 AM (8 h, 55 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32251881
Default Alt Text
D49920.id.diff (3 KB)

Event Timeline