diff options
author | rwatson <rwatson@FreeBSD.org> | 2006-06-26 09:38:08 +0000 |
---|---|---|
committer | rwatson <rwatson@FreeBSD.org> | 2006-06-26 09:38:08 +0000 |
commit | a46d883eaeab0b42f8c6f476f2382acc96850d1a (patch) | |
tree | 9aafbbc06bf9be3e1d1c461fc82bfa38d31fdd80 /sys/netinet/tcp_usrreq.c | |
parent | 72cfd5d2d51dbddee3b1f6d32a63609ba41c2aca (diff) | |
download | FreeBSD-src-a46d883eaeab0b42f8c6f476f2382acc96850d1a.zip FreeBSD-src-a46d883eaeab0b42f8c6f476f2382acc96850d1a.tar.gz |
In tcp6_usr_attach(), return immediately if SS_ISDISCONNECTED, to
avoid dereferencing an uninitialized inp variable.
Submitted by: Michiel Boland <michiel at boland dot org>
MFC after: 1 month
Diffstat (limited to 'sys/netinet/tcp_usrreq.c')
-rw-r--r-- | sys/netinet/tcp_usrreq.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c index bf5efa6..e6a31fa 100644 --- a/sys/netinet/tcp_usrreq.c +++ b/sys/netinet/tcp_usrreq.c @@ -647,10 +647,8 @@ tcp6_usr_accept(struct socket *so, struct sockaddr **nam) int v4 = 0; TCPDEBUG0; - if (so->so_state & SS_ISDISCONNECTED) { - error = ECONNABORTED; - goto out; - } + if (so->so_state & SS_ISDISCONNECTED) + return (ECONNABORTED); inp = sotoinpcb(so); KASSERT(inp != NULL, ("tcp6_usr_accept: inp == NULL")); |