Page MenuHomeFreeBSD
Files F102777598

D43414.diff
No OneTemporary
Actions

D43414.diff
View Options

diff --git a/sys/kern/uipc_debug.c b/sys/kern/uipc_debug.c
--- a/sys/kern/uipc_debug.c
+++ b/sys/kern/uipc_debug.c
@@ -242,7 +242,6 @@
db_print_indent(indent);
db_printf("dom_externalize: %p ", d->dom_externalize);
- db_printf("dom_dispose: %p\n", d->dom_dispose);
db_print_indent(indent);
db_printf("dom_protosw: %p ", d->dom_protosw);
@@ -278,10 +277,6 @@
db_printf("%sPR_WANTRCVD", comma ? ", " : "");
comma = 1;
}
- if (pr_flags & PR_RIGHTS) {
- db_printf("%sPR_RIGHTS", comma ? ", " : "");
- comma = 1;
- }
if (pr_flags & PR_IMPLOPCL) {
db_printf("%sPR_IMPLOPCL", comma ? ", " : "");
comma = 1;
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c
--- a/sys/kern/uipc_socket.c
+++ b/sys/kern/uipc_socket.c
@@ -1201,10 +1201,6 @@
so->so_dtor(so);
VNET_SO_ASSERT(so);
- if ((pr->pr_flags & PR_RIGHTS) && !SOLISTENING(so)) {
- MPASS(pr->pr_domain->dom_dispose != NULL);
- (*pr->pr_domain->dom_dispose)(so);
- }
if (pr->pr_detach != NULL)
pr->pr_detach(so);
@@ -2981,7 +2977,6 @@
void
sorflush(struct socket *so)
{
- struct protosw *pr;
int error;
VNET_SO_ASSERT(so);
@@ -3001,14 +2996,8 @@
return;
}
- pr = so->so_proto;
- if (pr->pr_flags & PR_RIGHTS) {
- MPASS(pr->pr_domain->dom_dispose != NULL);
- (*pr->pr_domain->dom_dispose)(so);
- } else {
- sbrelease(so, SO_RCV);
- SOCK_IO_RECV_UNLOCK(so);
- }
+ sbrelease(so, SO_RCV);
+ SOCK_IO_RECV_UNLOCK(so);
}
diff --git a/sys/kern/uipc_usrreq.c b/sys/kern/uipc_usrreq.c
--- a/sys/kern/uipc_usrreq.c
+++ b/sys/kern/uipc_usrreq.c
@@ -724,6 +724,9 @@
vp = NULL;
vplock = NULL;
+ if (!SOLISTENING(so))
+ unp_dispose(so);
+
UNP_LINK_WLOCK();
LIST_REMOVE(unp, unp_link);
if (unp->unp_gcflag & UNPGC_DEAD)
@@ -1700,15 +1703,12 @@
switch (how) {
case SHUT_RD:
- /*
- * XXXGL: so far it is safe to call sorflush() on unix/dgram,
- * because PR_RIGHTS flag saves us from destructive sbrelease()
- * on our protocol specific buffers.
- */
- sorflush(so);
+ socantrcvmore(so);
+ unp_dispose(so);
break;
case SHUT_RDWR:
- sorflush(so);
+ socantrcvmore(so);
+ unp_dispose(so);
/* FALLTHROUGH */
case SHUT_WR:
UNP_PCB_LOCK(unp);
@@ -3193,7 +3193,8 @@
so = unref[i]->f_data;
CURVNET_SET(so->so_vnet);
- sorflush(so);
+ socantrcvmore(so);
+ unp_dispose(so);
CURVNET_RESTORE();
}
@@ -3250,15 +3251,15 @@
* XXXGL Mark sb with SBS_CANTRCVMORE. This is needed to
* prevent uipc_sosend_dgram() or unp_disconnect() adding more
* data to the socket.
- * We are now in dom_dispose and it could be a call from
- * soshutdown() or from the final sofree(). The sofree() case
- * is simple as it guarantees that no more sends will happen,
- * however we can race with unp_disconnect() from our peer.
- * The shutdown(2) case is more exotic. It would call into
- * dom_dispose() only if socket is SS_ISCONNECTED. This is
- * possible if we did connect(2) on this socket and we also
- * had it bound with bind(2) and receive connections from other
- * sockets. Because soshutdown() violates POSIX (see comment
+ * We came here either through shutdown(2) or from the final
+ * sofree(). The sofree() case is simple as it guarantees
+ * that no more sends will happen, however we can race with
+ * unp_disconnect() from our peer. The shutdown(2) case is
+ * more exotic. It would call into unp_dispose() only if
+ * socket is SS_ISCONNECTED. This is possible if we did
+ * connect(2) on this socket and we also had it bound with
+ * bind(2) and receive connections from other sockets.
+ * Because uipc_shutdown() violates POSIX (see comment
* there) we will end up here shutting down our receive side.
* Of course this will have affect not only on the peer we
* connect(2)ed to, but also on all of the peers who had
@@ -3335,8 +3336,7 @@
*/
static struct protosw streamproto = {
.pr_type = SOCK_STREAM,
- .pr_flags = PR_CONNREQUIRED|PR_WANTRCVD|PR_RIGHTS|
- PR_CAPATTACH,
+ .pr_flags = PR_CONNREQUIRED | PR_WANTRCVD | PR_CAPATTACH,
.pr_ctloutput = &uipc_ctloutput,
.pr_abort = uipc_abort,
.pr_accept = uipc_peeraddr,
@@ -3362,8 +3362,7 @@
static struct protosw dgramproto = {
.pr_type = SOCK_DGRAM,
- .pr_flags = PR_ATOMIC | PR_ADDR |PR_RIGHTS | PR_CAPATTACH |
- PR_SOCKBUF,
+ .pr_flags = PR_ATOMIC | PR_ADDR | PR_CAPATTACH | PR_SOCKBUF,
.pr_ctloutput = &uipc_ctloutput,
.pr_abort = uipc_abort,
.pr_accept = uipc_peeraddr,
@@ -3391,8 +3390,8 @@
* due to our use of sbappendaddr. A new sbappend variants is needed
* that supports both atomic record writes and control data.
*/
- .pr_flags = PR_ADDR|PR_ATOMIC|PR_CONNREQUIRED|
- PR_WANTRCVD|PR_RIGHTS|PR_CAPATTACH,
+ .pr_flags = PR_ADDR | PR_ATOMIC | PR_CONNREQUIRED |
+ PR_WANTRCVD | PR_CAPATTACH,
.pr_ctloutput = &uipc_ctloutput,
.pr_abort = uipc_abort,
.pr_accept = uipc_peeraddr,
@@ -3419,7 +3418,6 @@
.dom_family = AF_LOCAL,
.dom_name = "local",
.dom_externalize = unp_externalize,
- .dom_dispose = unp_dispose,
.dom_nprotosw = 3,
.dom_protosw = {
&streamproto,
diff --git a/sys/sys/domain.h b/sys/sys/domain.h
--- a/sys/sys/domain.h
+++ b/sys/sys/domain.h
@@ -54,8 +54,6 @@
int (*dom_probe)(void); /* check for support (optional) */
int (*dom_externalize) /* externalize access rights */
(struct mbuf *, struct mbuf **, int);
- void (*dom_dispose) /* dispose of internalized rights */
- (struct socket *);
struct rib_head *(*dom_rtattach) /* initialize routing table */
(uint32_t);
void (*dom_rtdetach) /* clean up routing table */
diff --git a/sys/sys/protosw.h b/sys/sys/protosw.h
--- a/sys/sys/protosw.h
+++ b/sys/sys/protosw.h
@@ -157,7 +157,7 @@
#define PR_ADDR 0x02 /* addresses given with messages */
#define PR_CONNREQUIRED 0x04 /* connection required by protocol */
#define PR_WANTRCVD 0x08 /* want PRU_RCVD calls */
-#define PR_RIGHTS 0x10 /* passes capabilities */
+/* was PR_RIGHTS 0x10 passes capabilities */
#define PR_IMPLOPCL 0x20 /* implied open/close */
/* was PR_LASTHDR 0x40 enforce ipsec policy; last header */
#define PR_CAPATTACH 0x80 /* socket can attach in cap mode */

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 1:21 AM (20 h, 41 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14687974
Default Alt Text
D43414.diff (6 KB)

Event Timeline