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

Be more robust against garbage input on a TOE TLS TX socket.

Browse Source 
If a socket is closed or shutdown and a partial record (or what
appears to be a partial record) is waiting in the socket buffer,
discard the partial record and close the connection rather than
waiting forever for the rest of the record.

Reported by:	Harsh Jain @ Chelsio
Sponsored by:	Chelsio Communications
This commit is contained in:
John Baldwin 2018-05-18 19:09:11 +00:00
parent f2d19f98c1
commit 24ddd0ec9c
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=333810
1 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/dev/cxgbe/tom/t4_tls.c
View File

@ -1189,17 +1189,23 @@ t4_push_tls_records(struct adapter *sc, struct toepcb *toep, int drop)
/* /*
* A full TLS header is not yet queued, stop * A full TLS header is not yet queued, stop
* for now until more data is added to the * for now until more data is added to the
* socket buffer. * socket buffer. However, if the connection
* has been closed, we will never get the rest
* of the header so just discard the partial
* header and close the connection.
*/ */
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR4(KTR_CXGBE, "%s: tid %d sbavail %d sb_off %d", CTR5(KTR_CXGBE, "%s: tid %d sbavail %d sb_off %d%s",
__func__, toep->tid, sbavail(sb), tls_ofld->sb_off); __func__, toep->tid, sbavail(sb), tls_ofld->sb_off,
toep->flags & TPF_SEND_FIN ? "" : " SEND_FIN");
#endif #endif
if (sowwakeup) if (sowwakeup)
sowwakeup_locked(so); sowwakeup_locked(so);
else else
SOCKBUF_UNLOCK(sb); SOCKBUF_UNLOCK(sb);
SOCKBUF_UNLOCK_ASSERT(sb); SOCKBUF_UNLOCK_ASSERT(sb);
if (toep->flags & TPF_SEND_FIN)
t4_close_conn(sc, toep);
return; return;
} }
@ -1216,19 +1222,25 @@ t4_push_tls_records(struct adapter *sc, struct toepcb *toep, int drop)
/* /*
* The full TLS record is not yet queued, stop * The full TLS record is not yet queued, stop
* for now until more data is added to the * for now until more data is added to the
* socket buffer. * socket buffer. However, if the connection
* has been closed, we will never get the rest
* of the record so just discard the partial
* record and close the connection.
*/ */
#ifdef VERBOSE_TRACES #ifdef VERBOSE_TRACES
CTR5(KTR_CXGBE, CTR6(KTR_CXGBE,
"%s: tid %d sbavail %d sb_off %d plen %d", "%s: tid %d sbavail %d sb_off %d plen %d%s",
__func__, toep->tid, sbavail(sb), tls_ofld->sb_off, __func__, toep->tid, sbavail(sb), tls_ofld->sb_off,
plen); plen, toep->flags & TPF_SEND_FIN ? "" :
" SEND_FIN");
#endif #endif
if (sowwakeup) if (sowwakeup)
sowwakeup_locked(so); sowwakeup_locked(so);
else else
SOCKBUF_UNLOCK(sb); SOCKBUF_UNLOCK(sb);
SOCKBUF_UNLOCK_ASSERT(sb); SOCKBUF_UNLOCK_ASSERT(sb);
if (toep->flags & TPF_SEND_FIN)
t4_close_conn(sc, toep);
return; return;
} }