Differential D31977

ktls: Fix error/mode confusion in TCP_*TLS_MODE getsockopt handlers
ClosedPublic
Actions

Authored by markj on Sep 15 2021, 7:59 PM.

Details

Reviewers

jhb
gallatin

Group Reviewers

transport

Commits

rGbf25678226f0: ktls: Fix error/mode confusion in TCP_*TLS_MODE getsockopt handlers

Summary

ktls_get_(rx|tx)_mode() can return an errno value or a TLS mode, so
errors are effectively hidden. Fix this. Convert to the new socket
buffer locking macros while here.

Note that the socket buffer lock is not needed to synchronize the
SOLISTENING check here, we can rely on the PCB lock, acquired in
tcp_usr_listen().

Diff Detail

Repository

rS FreeBSD src repository - subversion

Lint

Lint Passed

Unit

No Test Coverage

Build Status

Buildable 41537
Build 38426: arc lint + arc unit

Event Timeline

markj created this revision.Sep 15 2021, 7:59 PM

Herald added a reviewer: transport. · View Herald TranscriptSep 15 2021, 7:59 PM

Herald added subscribers: melifaro, imp. · View Herald Transcript

markj requested review of this revision.Sep 15 2021, 7:59 PM

Harbormaster completed remote builds in B41537: Diff 95230.Sep 15 2021, 7:59 PM

markj added a parent revision: D31976: socket: Handle shutdown(2) with AIO jobs in flight.Sep 15 2021, 7:59 PM

markj added reviewers: jhb, gallatin.Sep 15 2021, 8:01 PM

I think this is fine, just one thought.

sys/netinet/tcp_usrreq.c
2566	Did you consider doing the SOLISTENING check here instead of in the ktls_get_*_mode() routines?

markj added inline comments.Sep 16 2021, 12:36 PM

sys/netinet/tcp_usrreq.c
2566	Hmm, not really. I noticed that other ktls_* routines check for listening sockets and the TCP socket option (wow there's a lot of them...) handlers generally do not, so it made sense to me to keep things consistent.