diff options
| -rw-r--r-- | sys/kern/uipc_socket.c | 8 | ||||
| -rw-r--r-- | sys/sys/socketvar.h | 1 |
2 files changed, 8 insertions, 1 deletions
diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index f1376f3..0c85717 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -1133,8 +1133,14 @@ sorflush(so) socantrcvmore(so); sbunlock(sb); asb = *sb; - bzero(sb, sizeof (*sb)); + /* + * Invalidate/clear most of the sockbuf structure, but keep + * its selinfo structure valid. + */ + bzero(&sb->sb_startzero, + sizeof(*sb) - offsetof(struct sockbuf, sb_startzero)); splx(s); + if (pr->pr_flags & PR_RIGHTS && pr->pr_domain->dom_dispose) (*pr->pr_domain->dom_dispose)(asb.sb_mb); sbrelease(&asb, so); diff --git a/sys/sys/socketvar.h b/sys/sys/socketvar.h index e5f8756..223ccc2 100644 --- a/sys/sys/socketvar.h +++ b/sys/sys/socketvar.h @@ -100,6 +100,7 @@ struct socket { */ struct sockbuf { struct selinfo sb_sel; /* process selecting read/write */ +#define sb_startzero sb_mb struct mbuf *sb_mb; /* the mbuf chain */ u_int sb_cc; /* actual chars in buffer */ u_int sb_hiwat; /* max actual char count */ |
