rpctls_impl.c: Fix handling of daemon failure
ClosedPublic
Actions

Authored by rmacklem on Sat, Jun 21, 1:25 AM.

Details

Reviewers

Commits

rG26ee05939209: rpctls_impl.c: Fix handling of socket for daemon failure

Summary

If the client side rpc.tlsclntd is not running when a
NFS-over-TLS connection attempt is made, the socket
is left open. This results in the rpc.tlsservd daemon on
the NFS server being stuck in SSL_accept() until the
daemon is restarted.

This patch fixes this by doing soclose() on the socket
for the cases where the daemon has not acquired the
socket.

It is still possible for a broken client to get the
rpc.tlsservd daemon stuck. This will be addressed
in a separate commit.

Test Plan

Tested by doing repeated NFS-over-TLS mount
attempts with both the daemon running and not
running.

Diff Detail

Repository

rG FreeBSD src repository

Lint

Lint Not Applicable

Unit

Tests Not Applicable

Event Timeline

rmacklem created this revision.Sat, Jun 21, 1:25 AM

Herald added a subscriber: imp. · View Herald TranscriptSat, Jun 21, 1:25 AM

rmacklem requested review of this revision.Sat, Jun 21, 1:25 AM

glebius accepted this revision.Sat, Jun 21, 5:37 PM

glebius added inline comments.

sys/rpc/rpcsec_tls/rpctls_impl.c
234	The comment contradicts the fact that we did RB_REMOVE() two lines above.

This revision is now accepted and ready to land.Sat, Jun 21, 5:37 PM

I clicked on "Accept", trusting your expertise. The change looks correct, with small comment nit. But I didn't test it. And to be fair the gist of the code already washed out of my L3 brain cache :)

rmacklem marked an inline comment as done.Sat, Jun 21, 11:37 PM

Closed by commit rG26ee05939209: rpctls_impl.c: Fix handling of socket for daemon failure (authored by rmacklem). · Explain WhySat, Jun 21, 11:53 PM

This revision was automatically updated to reflect the committed changes.

rmacklem added a commit: rG26ee05939209: rpctls_impl.c: Fix handling of socket for daemon failure.