Date: Tue, 3 Mar 1998 17:10:04 -0800 (PST) From: archie@whistle.com To: FreeBSD-gnats-submit@FreeBSD.ORG Subject: ports/5911: divert socket bug fix needed for SKIP port Message-ID: <199803040110.RAA10518@bubba.whistle.com>
next in thread | raw e-mail | index | archive | help
>Number: 5911
>Category: ports
>Synopsis: divert socket bug fix needed for SKIP port
>Confidential: no
>Severity: critical
>Priority: medium
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Mar 3 17:20:01 PST 1998
>Last-Modified:
>Originator: Archie Cobbs
>Organization:
Whistle Communications, Inc.
>Release: FreeBSD 2.2.5-STABLE i386
>Environment:
FreeBSD 2.2.5
>Description:
Kernel will panic if you combine divert sockets and the SKIP port.
>How-To-Repeat:
Build kernel with IPDIVERT and IPFIREWALL
Install SKIP
run natd (for example)
>Fix:
Replace the patchfile "patch-bf" with this new version:
diff -ur --unidirectional-new-file skipsrc-1.0.orig/skip/freebsd/skip_es.c skipsrc-1.0/skip/freebsd/skip_es.c
--- skipsrc-1.0.orig/skip/freebsd/skip_es.c Fri Oct 25 13:12:42 1996
+++ skipsrc-1.0/skip/freebsd/skip_es.c Tue Mar 3 16:58:54 1998
@@ -81,6 +81,11 @@
static unsigned short skip_pktid;
static skip_softc_t skip_softc[SKIP_MAX_OPENS];
+#ifdef NEW_TIMEOUT_INTERFACE
+static struct callout_handle
+ skip_timeout_handle = CALLOUT_HANDLE_INITIALIZER(&skip_timeout_handle);
+#endif
+
/*
* statistics
*/
@@ -252,7 +257,10 @@
for (pr = inetdomain.dom_protosw;
pr < inetdomain.dom_protoswNPROTOSW; pr++) {
- pr->pr_input = skip_ifinput;
+ if (pr->pr_protocol == IPPROTO_DIVERT)
+ continue;
+ pr->pr_input =
+ (void (*)(struct mbuf *, int)) skip_ifinput;
}
splx(s);
}
@@ -788,7 +796,11 @@
static void
skip_inittimers()
{
+#ifdef NEW_TIMEOUT_INTERFACE
+ skip_timeout_handle = timeout(skip_timer, NULL, skip_key_tick * hz);
+#else
timeout(skip_timer, NULL, skip_key_tick * hz);
+#endif
}
/* skip_uninittimers()
@@ -800,7 +812,12 @@
static void
skip_uninittimers()
{
+#ifdef NEW_TIMEOUT_INTERFACE
+ untimeout(skip_timer, NULL, skip_timeout_handle);
+ callout_handle_init(&skip_timeout_handle);
+#else
untimeout(skip_timer, NULL);
+#endif
}
/* skip_timer()
@@ -819,7 +836,11 @@
* run through the key store
*/
skip_key_iterate(skip_key_check, NULL);
+#ifdef NEW_TIMEOUT_INTERFACE
+ skip_timeout_handle = timeout(skip_timer, NULL, skip_key_tick * hz);
+#else
timeout(skip_timer, NULL, skip_key_tick * hz);
+#endif
}
#ifdef notdef
@@ -1718,7 +1739,7 @@
*/
decryptbuf->m_data += iphlen;
- SKIP_DEBUG2("skip_ifinput: decryptbuf m_len=%d m_data=%d\n",
+ SKIP_DEBUG2("skip_ifinput: decryptbuf m_len=%d m_data=%p\n",
decryptbuf->m_len, decryptbuf->m_data);
}
@@ -2005,7 +2026,7 @@
if (params.kp_alg) {
newip->ip_p = SKIP_NEXT_ESP;
} else {
- newip->ip_p = IPPROTO_ENCAP;
+ newip->ip_p = IPPROTO_IPIP;
}
}
skip_if->stats.skip_if_raw_out++;
@@ -2097,7 +2118,7 @@
register skip_param_t *params = &res->params;
register struct ip *ip = mtod(original, struct ip *);
int rc, s, iphlen;
- struct mbuf *outbuf, *new_hdr;
+ struct mbuf *outbuf;
SKIP_PRINT("skip_decrypt_done", params);
@@ -2125,7 +2146,7 @@
*/
outbuf = (res->modes & SKIP_CRYPT_ON) ? m : original;
- if (res->proto != IPPROTO_ENCAP) {
+ if (res->proto != IPPROTO_IPIP) {
/*
* transport mode, need to copy original IP header
*/
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199803040110.RAA10518>