diff options
| author | Erik Nordmark <Erik.Nordmark@Sun.COM> | 2009-11-22 01:09:09 -0800 |
|---|---|---|
| committer | Erik Nordmark <Erik.Nordmark@Sun.COM> | 2009-11-22 01:09:09 -0800 |
| commit | 43e4e284f04f2e5c3382eb84ec517764be76d1a3 (patch) | |
| tree | 58d62fe4da9bdb2bec625a1c2902f1ea764b5c23 /usr/src/uts/common/inet/tcp/tcp.c | |
| parent | b16da2e29e074fb6eaeadc4fd7d17ae7340ba240 (diff) | |
| download | illumos-joyent-43e4e284f04f2e5c3382eb84ec517764be76d1a3.tar.gz | |
6903544 NULL pointer dereference in tcp_xmit_end/tcp_close_output
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
| -rw-r--r-- | usr/src/uts/common/inet/tcp/tcp.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c index 687fe9b653..134e204a8f 100644 --- a/usr/src/uts/common/inet/tcp/tcp.c +++ b/usr/src/uts/common/inet/tcp/tcp.c @@ -2315,9 +2315,6 @@ tcp_accept_swap(tcp_t *listener, tcp_t *acceptor, tcp_t *eager) /* Do the IPC initialization */ CONN_INC_REF(econnp); - econnp->conn_family = aconnp->conn_family; - econnp->conn_ipversion = aconnp->conn_ipversion; - /* Done with old IPC. Drop its ref on its connp */ CONN_DEC_REF(aconnp); } @@ -8566,11 +8563,11 @@ tcp_build_hdrs(tcp_t *tcp) if (buflen != 0) { bcopy(buf, connp->conn_ht_ulp, buflen); } else { - tcpha->tha_lport = connp->conn_lport; - tcpha->tha_fport = connp->conn_fport; tcpha->tha_sum = 0; tcpha->tha_offset_and_reserved = (5 << 4); } + tcpha->tha_lport = connp->conn_lport; + tcpha->tha_fport = connp->conn_fport; /* * IP wants our header length in the checksum field to |