d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix handling of errors from pru_send(PRUS_NOTREADY)

Browse Source 
PRUS_NOTREADY indicates that the caller has not yet populated the chain
with data, and so it is not ready for transmission.  This is used by
sendfile (for async I/O) and KTLS (for encryption).  In particular, if
pru_send returns an error, the caller is responsible for freeing the
chain since other implicit references to the data buffers exist.

For async sendfile, it happens that an error will only be returned if
the connection was dropped, in which case tcp_usr_ready() will handle
freeing the chain.  But since KTLS can be used in conjunction with the
regular socket I/O system calls, many more error cases - which do not
result in the connection being dropped - are reachable.  In these cases,
KTLS was effectively assuming success.

So:
- Change sosend_generic() to free the mbuf chain if
  pru_send(PRUS_NOTREADY) fails.  Nothing else owns a reference to the
  chain at that point.
- Similarly, in vn_sendfile() change the !async I/O && KTLS case to free
  the chain.
- If async I/O is still outstanding when pru_send fails in
  vn_sendfile(), set an error in the sfio structure so that the
  connection is aborted and the mbuf chain is freed.

Reviewed by:	gallatin, tuexen
Discussed with:	jhb
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D30349
This commit is contained in:
Mark Johnston 2021-05-21 17:44:46 -04:00
parent 7d2608a5d2
commit 916c61a5ed
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_sendfile.c
View File

@ -1175,8 +1175,12 @@ prepend_header:
if (tls != NULL && tls->mode == TCP_TLS_MODE_SW) {
error = (*so->so_proto->pr_usrreqs->pru_send)
(so, PRUS_NOTREADY, m, NULL, NULL, td);
soref(so);
ktls_enqueue(m, so, tls_enq_cnt);
if (error != 0) {
m_freem(m);
} else {
soref(so);
ktls_enqueue(m, so, tls_enq_cnt);
}
} else
#endif
error = (*so->so_proto->pr_usrreqs->pru_send)
@ -1187,11 +1191,11 @@ prepend_header:
soref(so);
error = (*so->so_proto->pr_usrreqs->pru_send)
(so, PRUS_NOTREADY, m, NULL, NULL, td);
sendfile_iodone(sfio, NULL, 0, 0);
sendfile_iodone(sfio, NULL, 0, error);
}
CURVNET_RESTORE();
m = NULL; /* pru_send always consumes */
m = NULL;
if (error)
goto done;
sbytes += space + hdrlen;

19
sys/kern/uipc_socket.c
View File

@ -1767,18 +1767,13 @@ restart:
#ifdef KERN_TLS
if (tls != NULL && tls->mode == TCP_TLS_MODE_SW) {
/*
* Note that error is intentionally
* ignored.
*
* Like sendfile(), we rely on the
* completion routine (pru_ready())
* to free the mbufs in the event that
* pru_send() encountered an error and
* did not append them to the sockbuf.
*/
soref(so);
ktls_enqueue(top, so, tls_enq_cnt);
if (error != 0) {
m_freem(top);
top = NULL;
} else {
soref(so);
ktls_enqueue(top, so, tls_enq_cnt);
}
}
#endif
clen = 0;