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

Clean up return handling for a number of SPX-related routines that

Browse Source 
were derived from more complex TCP versions of the same:

- spx_close(), spx_disconnect(), spx_drop(), and spx_usrclosed() all
  always free's the spxpcb invalidating the argument, so a return
  value is not required to indicate if it has.
- Annotate that the cb arguments to each of these functions is
  invalidated via a comment.
- When tearing down a pcb due to sonewconn() having failed, mark the
  cb as NULL; later, when deciding whether to store trace information
  due to SO_DEBUG, check that cb is not NULL before dereferencing or
  a NULL pointer dereference may occur.

MFC after:	3 weeks
This commit is contained in:
Robert Watson 2005-01-09 05:25:02 +00:00
parent 971365a711
commit 2375a5a16a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=139931
1 changed files with 29 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
sys/netipx/spx_usrreq.c
View File

@ -1,5 +1,5 @@
/*-
* Copyright (c) 2004 Robert N. M. Watson
* Copyright (c) 2004-2005 Robert N. M. Watson
* Copyright (c) 1995, Mike Mitchell
* Copyright (c) 1984, 1985, 1986, 1987, 1993
* The Regents of the University of California. All rights reserved.
@ -81,15 +81,15 @@ static struct spx_istat spx_istat;
static const int spx_backoff[SPX_MAXRXTSHIFT+1] =
{ 1, 2, 4, 8, 16, 32, 64, 64, 64, 64, 64, 64, 64 };
static struct spxpcb *spx_close(struct spxpcb *cb);
static struct spxpcb *spx_disconnect(struct spxpcb *cb);
static struct spxpcb *spx_drop(struct spxpcb *cb, int errno);
static void spx_close(struct spxpcb *cb);
static void spx_disconnect(struct spxpcb *cb);
static void spx_drop(struct spxpcb *cb, int errno);
static int spx_output(struct spxpcb *cb, struct mbuf *m0);
static int spx_reass(struct spxpcb *cb, struct spx *si);
static void spx_setpersist(struct spxpcb *cb);
static void spx_template(struct spxpcb *cb);
static struct spxpcb *spx_timers(struct spxpcb *cb, int timer);
static struct spxpcb *spx_usrclosed(struct spxpcb *cb);
static void spx_usrclosed(struct spxpcb *cb);
static int spx_usr_abort(struct socket *so);
static int spx_accept(struct socket *so, struct sockaddr **nam);
@ -344,12 +344,14 @@ spx_input(m, ipxp)
so->so_head = NULL;
ACCEPT_UNLOCK();
soabort(so);
cb = NULL;
}
si->si_seq = ntohs(si->si_seq);
si->si_ack = ntohs(si->si_ack);
si->si_alo = ntohs(si->si_alo);
m_freem(dtom(si));
if (cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG || traceallspxs)
if (cb == NULL || cb->s_ipxpcb->ipxp_socket->so_options & SO_DEBUG ||
traceallspxs)
spx_trace(SA_DROP, (u_char)ostate, cb, &spx_savesi, 0);
return;
@ -1590,22 +1592,18 @@ static int
spx_shutdown(so)
struct socket *so;
{
int error;
int s;
struct ipxpcb *ipxp;
struct spxpcb *cb;
error = 0;
ipxp = sotoipxpcb(so);
cb = ipxtospxpcb(ipxp);
s = splnet();
socantsendmore(so);
cb = spx_usrclosed(cb);
if (cb != NULL)
error = spx_output(cb, NULL);
spx_usrclosed(cb);
splx(s);
return (error);
return (0);
}
static int
@ -1659,8 +1657,9 @@ spx_template(cb)
* discard spx control block itself
* discard ipx protocol control block
* wake up any sleepers
* cb will always be invalid after this call.
*/
static struct spxpcb *
void
spx_close(cb)
register struct spxpcb *cb;
{
@ -1682,33 +1681,39 @@ spx_close(cb)
soisdisconnected(so);
ipx_pcbdetach(ipxp);
spxstat.spxs_closed++;
return (NULL);
}
/*
* Someday we may do level 3 handshaking
* to close a connection or send a xerox style error.
* For now, just close.
* cb will always be invalid after this call.
*/
static struct spxpcb *
static void
spx_usrclosed(cb)
register struct spxpcb *cb;
{
return (spx_close(cb));
spx_close(cb);
}
static struct spxpcb *
/*
* cb will always be invalid after this call.
*/
static void
spx_disconnect(cb)
register struct spxpcb *cb;
{
return (spx_close(cb));
spx_close(cb);
}
/*
* Drop connection, reporting
* the specified error.
* cb will always be invalid after this call.
*/
static struct spxpcb *
static void
spx_drop(cb, errno)
register struct spxpcb *cb;
int errno;
@ -1727,7 +1732,7 @@ spx_drop(cb, errno)
} else
spxstat.spxs_conndrops++;
so->so_error = errno;
return (spx_close(cb));
spx_close(cb);
}
/*
@ -1827,7 +1832,8 @@ spx_timers(cb, timer)
if (++cb->s_rxtshift > SPX_MAXRXTSHIFT) {
cb->s_rxtshift = SPX_MAXRXTSHIFT;
spxstat.spxs_timeoutdrop++;
cb = spx_drop(cb, ETIMEDOUT);
spx_drop(cb, ETIMEDOUT);
cb = NULL;
break;
}
spxstat.spxs_rexmttimeo++;
@ -1892,7 +1898,8 @@ spx_timers(cb, timer)
break;
dropit:
spxstat.spxs_keepdrops++;
cb = spx_drop(cb, ETIMEDOUT);
spx_drop(cb, ETIMEDOUT);
cb = NULL;
break;
}
return (cb);