From owner-cvs-src@FreeBSD.ORG Mon Jun 20 12:15:10 2005 Return-Path: X-Original-To: cvs-src@freebsd.org Delivered-To: cvs-src@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id EB57D16A41C; Mon, 20 Jun 2005 12:15:10 +0000 (GMT) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (transport.cksoft.de [62.111.66.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id A33E043D49; Mon, 20 Jun 2005 12:15:10 +0000 (GMT) (envelope-from bzeeb-lists@lists.zabbadoz.net) Received: from transport.cksoft.de (localhost [127.0.0.1]) by transport.cksoft.de (Postfix) with ESMTP id 668E61FFBF8; Mon, 20 Jun 2005 14:15:08 +0200 (CEST) Received: by transport.cksoft.de (Postfix, from userid 66) id 3FED31FFAD4; Mon, 20 Jun 2005 14:15:05 +0200 (CEST) Received: by mail.int.zabbadoz.net (Postfix, from userid 1060) id 99C1E157B9; Mon, 20 Jun 2005 12:10:40 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.int.zabbadoz.net (Postfix) with ESMTP id 9706115652; Mon, 20 Jun 2005 12:10:40 +0000 (UTC) Date: Mon, 20 Jun 2005 12:10:40 +0000 (UTC) From: "Bjoern A. Zeeb" X-X-Sender: bz@e0-0.zab2.int.zabbadoz.net To: Hajimu UMEMOTO In-Reply-To: Message-ID: References: <200506200839.j5K8dUFm009042@repoman.freebsd.org> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-Virus-Scanned: by AMaViS cksoft-s20020300-20031204bz on transport.cksoft.de Cc: cvs-src@FreeBSD.org, "Bjoern A. Zeeb" , cvs-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: cvs commit: src/sys/netinet in_gif.c X-BeenThere: cvs-src@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 20 Jun 2005 12:15:11 -0000 On Mon, 20 Jun 2005, Hajimu UMEMOTO wrote: Hi, > >>>>> On Mon, 20 Jun 2005 08:39:30 +0000 (UTC) > >>>>> "Bjoern A. Zeeb" said: > > bz> Modified files: > bz> sys/netinet in_gif.c > bz> Log: > bz> Fix IP(v6) over IP tunneling most likely broken with ifnet changes. > > Thanks! I suffered this issue. > It seems there is same issue in in6_gif.c as well. I cannot test it but it looks the same. If this works for you either commit it yourself w/ re@ approval or let me know. http://sources.zabbadoz.net/freebsd/patchset/sys-netinet6-in6_gif.c.diff Index: in6_gif.c =================================================================== RCS file: /local/mirror/FreeBSD/r/ncvs/src/sys/netinet6/in6_gif.c,v retrieving revision 1.21 diff -u -p -r1.21 in6_gif.c --- in6_gif.c 10 Jun 2005 16:49:22 -0000 1.21 +++ in6_gif.c 20 Jun 2005 11:57:44 -0000 @@ -234,13 +234,21 @@ in6_gif_input(mp, offp, proto) { struct mbuf *m = *mp; struct ifnet *gifp = NULL; + struct gif_softc *sc; struct ip6_hdr *ip6; int af = 0; u_int32_t otos; ip6 = mtod(m, struct ip6_hdr *); - gifp = (struct ifnet *)encap_getarg(m); + sc = (struct gif_softc *)encap_getarg(m); + if (sc == NULL) { + m_freem(m); + ipstat.ips_nogif++; + return; + } + + gifp = GIF2IFP(sc); if (gifp == NULL || (gifp->if_flags & IFF_UP) == 0) { m_freem(m); -- Bjoern A. Zeeb bzeeb at Zabbadoz dot NeT