diff options
| author | Robert Watson <rwatson@FreeBSD.org> | 2006-06-26 09:38:08 +0000 |
|---|---|---|
| committer | Robert Watson <rwatson@FreeBSD.org> | 2006-06-26 09:38:08 +0000 |
| commit | b4470c16391996d2296ba5078786958861a7c86a (patch) | |
| tree | 9aafbbc06bf9be3e1d1c461fc82bfa38d31fdd80 /sys/netinet/tcp_usrreq.c | |
| parent | 8ca0124685094048eb92e68610e091410ff1b1bc (diff) | |
| download | src-b4470c16391996d2296ba5078786958861a7c86a.tar.gz src-b4470c16391996d2296ba5078786958861a7c86a.zip | |
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
Notes
Notes:
svn path=/head/; revision=159944
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 bf5efa6fb297..e6a31fae7416 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")); |