Page MenuHomeFreeBSD
Differential D35124

sockets: don't call dom_dispose() on a listening socket
ClosedPublic
Actions

Authored by glebius on May 4 2022, 6:44 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Oct 9, 9:45 PM
Unknown Object (File)
Fri, Sep 18, 6:15 AM
Unknown Object (File)
Fri, Sep 18, 6:08 AM
Unknown Object (File)
Sep 9 2026, 5:21 PM
Unknown Object (File)
Sep 7 2026, 11:43 PM
Unknown Object (File)
Sep 4 2026, 9:05 PM
Unknown Object (File)
Aug 29 2026, 6:16 AM
Unknown Object (File)
Aug 23 2026, 3:56 PM
View All Files
Subscribers
imp
markj

Details

Reviewers
markj
Group Reviewers
network
Commits
rG42f2fa9953da: sockets: don't call dom_dispose() on a listening socket
Summary

sorflush() already did the right thing, so only sofree() needed
a fix. Turn check into assertion in our only dom_dispose method.

Diff Detail

Repository
rG FreeBSD src repository
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

glebius created this revision.May 4 2022, 6:44 PM
Herald added a subscriber: imp. · View Herald TranscriptMay 4 2022, 6:44 PM
glebius requested review of this revision.May 4 2022, 6:44 PM
glebius added a parent revision: D35123: sockets: assert that any protocol with PR_RIGHTS has dom_dispose().
glebius added a child revision: D35125: sockets: remove the socket-on-stack hack from sorflush().
Harbormaster completed remote builds in B45469: Diff 105681.May 4 2022, 6:45 PM
markj accepted this revision as: markj.May 4 2022, 7:29 PM
markj added a subscriber: markj.

Does this fix a bug? It's not obvious to me if so. Setting UNPGC_IGNORE_RIGHTS on the listening socket should be harmless.

This revision is now accepted and ready to land.May 4 2022, 7:29 PM
glebius added a comment.May 4 2022, 7:35 PM

There is no bug here. The disposal is a socket buffer operation, so better do the check one layer up. This is a preparation before merging: sorflush(), dom_dispose, pru_flush and pru_shutdown into a single pru_shutdown method.

Closed by commit rG42f2fa9953da: sockets: don't call dom_dispose() on a listening socket (authored by glebius). · Explain WhyMay 9 2022, 5:55 PM
This revision was automatically updated to reflect the committed changes.
glebius added a commit: rG42f2fa9953da: sockets: don't call dom_dispose() on a listening socket.

Revision Contents
Changeset List

PathSize
sys/
kern/
2 lines
5 lines

Diff 105788

View Options

sys/kern/uipc_socket.c

Loading...
View Options

sys/kern/uipc_usrreq.c

Loading...