d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

In raw and raw-derived socket types, maintain and enforce invariant that

Browse Source 
the so_pcb pointer on the socket is always non-NULL.  This eliminates
countless unnecessary error checks, replacing them with assertions.

MFC after:	3 months
This commit is contained in:
rwatson 2006-04-01 15:55:44 +00:00
parent 5965562ffe
commit 173781a39a
2 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
sys/net/raw_usrreq.c
View File

@ -153,11 +153,9 @@ raw_uabort(struct socket *so)
static int
raw_uattach(struct socket *so, int proto, struct thread *td)
{
struct rawcb *rp = sotorawcb(so);
int error;
if (rp == 0)
return EINVAL;
KASSERT(sotorawcb(so) == NULL, ("raw_uattach: rp != NULL"));
if (td && (error = suser(td)) != 0)
return error;
return raw_attach(so, proto);
@ -183,9 +181,7 @@ raw_udetach(struct socket *so)
{
struct rawcb *rp = sotorawcb(so);
if (rp == 0)
return;
KASSERT(rp != NULL, ("raw_udetach: rp == NULL"));
raw_detach(rp);
}
@ -194,8 +190,7 @@ raw_udisconnect(struct socket *so)
{
struct rawcb *rp = sotorawcb(so);
if (rp == 0)
return EINVAL;
KASSERT(rp != NULL, ("raw_udisconnect: rp == NULL"));
if (rp->rcb_faddr == 0) {
return ENOTCONN;
}
@ -211,8 +206,7 @@ raw_upeeraddr(struct socket *so, struct sockaddr **nam)
{
struct rawcb *rp = sotorawcb(so);
if (rp == 0)
return EINVAL;
KASSERT(rp != NULL, ("raw_upeeraddr: rp == NULL"));
if (rp->rcb_faddr == 0) {
return ENOTCONN;
}
@ -230,10 +224,7 @@ raw_usend(struct socket *so, int flags, struct mbuf *m,
int error;
struct rawcb *rp = sotorawcb(so);
if (rp == 0) {
error = EINVAL;
goto release;
}
KASSERT(rp != NULL, ("raw_usend: rp == NULL"));
if (flags & PRUS_OOB) {
error = EOPNOTSUPP;
@ -269,10 +260,8 @@ release:
static int
raw_ushutdown(struct socket *so)
{
struct rawcb *rp = sotorawcb(so);
if (rp == 0)
return EINVAL;
KASSERT(sotorawcb(so) != NULL, ("raw_ushutdown: rp == NULL"));
socantsendmore(so);
return 0;
}
@ -282,8 +271,7 @@ raw_usockaddr(struct socket *so, struct sockaddr **nam)
{
struct rawcb *rp = sotorawcb(so);
if (rp == 0)
return EINVAL;
KASSERT(rp != NULL, ("raw_usockaddr: rp == NULL"));
if (rp->rcb_laddr == 0)
return EINVAL;
*nam = sodupsockaddr(rp->rcb_laddr, M_WAITOK);

3
sys/netkey/keysock.c
View File

@ -295,8 +295,7 @@ key_attach(struct socket *so, int proto, struct thread *p)
struct keycb *kp;
int s, error;
if (sotorawcb(so) != 0)
return EISCONN; /* XXX panic? */
KASSERT(sotorawcb(so) == NULL, ("key_attach: so_pcb != NULL"));
kp = (struct keycb *)malloc(sizeof *kp, M_PCB, M_WAITOK); /* XXX */
if (kp == 0)
return ENOBUFS;