summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/inet/tcp/tcp.c
diff options
context:
space:
mode:
authordanmcd <none@none>2006-11-29 16:09:14 -0800
committerdanmcd <none@none>2006-11-29 16:09:14 -0800
commit32350c00c8d5fb0a0b028301900b9ea9166e9ee9 (patch)
tree112316b8f62b07071c630c765a652de15b2dffb4 /usr/src/uts/common/inet/tcp/tcp.c
parent1d6b7ad8d07a33040a5c059cdaf3f953f8c1ca24 (diff)
downloadillumos-joyent-32350c00c8d5fb0a0b028301900b9ea9166e9ee9.tar.gz
6478675 inconsistent ESP padding verification in OpenSolaris
Contributed by Jean-Paul Degabriele <jeanpaul.degabriele@gmail.com>. 6481387 Freed queue_t gets passed to ipsec_log_policy_failure() during OPL ttcp runs... 6494630 qs21 may be validating cert chains incorrectly. 6495455 assertion failure when using IPsec global policy with IPv6 tunnels 6496323 AH-only on tunnels doesn't work. 6497625 More debugging and output cleanliness in in.iked's cert-chain processing.
Diffstat (limited to 'usr/src/uts/common/inet/tcp/tcp.c')
-rw-r--r--usr/src/uts/common/inet/tcp/tcp.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/usr/src/uts/common/inet/tcp/tcp.c b/usr/src/uts/common/inet/tcp/tcp.c
index cbe35bd58c..d42c01d93e 100644
--- a/usr/src/uts/common/inet/tcp/tcp.c
+++ b/usr/src/uts/common/inet/tcp/tcp.c
@@ -12082,7 +12082,7 @@ tcp_check_policy(tcp_t *tcp, mblk_t *first_mp, ipha_t *ipha, ip6_t *ip6h,
if (act == NULL || act->ipa_act.ipa_type == IPSEC_ACT_BYPASS ||
act->ipa_act.ipa_type == IPSEC_ACT_CLEAR)
return (B_TRUE);
- ipsec_log_policy_failure(tcp->tcp_wq, IPSEC_POLICY_MISMATCH,
+ ipsec_log_policy_failure(IPSEC_POLICY_MISMATCH,
"tcp_check_policy", ipha, ip6h, secure);
ip_drop_packet(first_mp, B_TRUE, NULL, NULL,
&ipdrops_tcp_clear, &tcp_dropper);
@@ -12093,9 +12093,8 @@ tcp_check_policy(tcp_t *tcp, mblk_t *first_mp, ipha_t *ipha, ip6_t *ip6h,
* We have a secure packet.
*/
if (act == NULL) {
- ipsec_log_policy_failure(tcp->tcp_wq,
- IPSEC_POLICY_NOT_NEEDED, "tcp_check_policy", ipha, ip6h,
- secure);
+ ipsec_log_policy_failure(IPSEC_POLICY_NOT_NEEDED,
+ "tcp_check_policy", ipha, ip6h, secure);
ip_drop_packet(first_mp, B_TRUE, NULL, NULL,
&ipdrops_tcp_secure, &tcp_dropper);
return (B_FALSE);