diff options
| author | rrs <rrs@FreeBSD.org> | 2010-06-06 02:32:20 +0000 |
|---|---|---|
| committer | rrs <rrs@FreeBSD.org> | 2010-06-06 02:32:20 +0000 |
| commit | 923bc21fb4b430222e6ddbb17eb50bd4ab524ba8 (patch) | |
| tree | 91200c6c85b1ae0f157b4ec6880f4063de8accbc | |
| parent | 6b70929829667f58f45504dfc9330a7f6d52dcc8 (diff) | |
| download | FreeBSD-src-923bc21fb4b430222e6ddbb17eb50bd4ab524ba8.zip FreeBSD-src-923bc21fb4b430222e6ddbb17eb50bd4ab524ba8.tar.gz | |
Bruce's fix for some return's in
error legs.
MFC after: 1 week
| -rw-r--r-- | sys/netinet/sctp_usrreq.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index ed2a95d..bb590e9 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -4678,6 +4678,8 @@ sctp_accept(struct socket *so, struct sockaddr **addr) struct sockaddr_in *sin; SCTP_MALLOC_SONAME(sin, struct sockaddr_in *, sizeof *sin); + if (sin == NULL) + return (ENOMEM); sin->sin_family = AF_INET; sin->sin_len = sizeof(*sin); sin->sin_port = ((struct sockaddr_in *)&store)->sin_port; @@ -4691,6 +4693,8 @@ sctp_accept(struct socket *so, struct sockaddr **addr) struct sockaddr_in6 *sin6; SCTP_MALLOC_SONAME(sin6, struct sockaddr_in6 *, sizeof *sin6); + if (sin6 == NULL) + return (ENOMEM); sin6->sin6_family = AF_INET6; sin6->sin6_len = sizeof(*sin6); sin6->sin6_port = ((struct sockaddr_in6 *)&store)->sin6_port; @@ -4756,6 +4760,8 @@ sctp_ingetaddr(struct socket *so, struct sockaddr **addr) * Do the malloc first in case it blocks. */ SCTP_MALLOC_SONAME(sin, struct sockaddr_in *, sizeof *sin); + if (sin == NULL) + return (ENOMEM); sin->sin_family = AF_INET; sin->sin_len = sizeof(*sin); inp = (struct sctp_inpcb *)so->so_pcb; @@ -4858,6 +4864,8 @@ sctp_peeraddr(struct socket *so, struct sockaddr **addr) return (ENOTCONN); } SCTP_MALLOC_SONAME(sin, struct sockaddr_in *, sizeof *sin); + if (sin == NULL) + return (ENOMEM); sin->sin_family = AF_INET; sin->sin_len = sizeof(*sin); |
