From owner-svn-src-all@freebsd.org Fri Feb 12 02:50:21 2016 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 0109EAA5410; Fri, 12 Feb 2016 02:50:21 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: from mail-pa0-x22a.google.com (mail-pa0-x22a.google.com [IPv6:2607:f8b0:400e:c03::22a]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C45FC1F49; Fri, 12 Feb 2016 02:50:20 +0000 (UTC) (envelope-from koobs.freebsd@gmail.com) Received: by mail-pa0-x22a.google.com with SMTP id yy13so38890344pab.3; Thu, 11 Feb 2016 18:50:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:reply-to:subject:references:to:from:message-id:date :user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=WCT76WxiadKCKzWoXMQIhvDu6yYiwZHn5WQBA1nFcwY=; b=pImO57Om/QpQbHSvcA9aj4h8GbCGg6b/3ZYYxobWJH/wkDZNnXITUrJFgYLQdA5Y5n vR0zlAHyo4u5SonwER1cr9r4+dwlXC/+dvZcAQsRQkokGijg7QHSjdpPb1ejFdmabKQi /LSTr2snzrxtWvy/2j/rrukcuNgcR0dq7Vx9Jf2r7nf7DMD4Jt0PY6ni+hxmf/zwwrsL wB6QLI9Avh9IXohw8u0OEgfnDvgbKc8LQNJ+PQN0q/khUOh26v0EMTB4b5RpYDQFnTnk 3Ao5Zl+I+8C9j4tpkg1Sbf/zZII4mkD42ivj8jR0hdnhi1KOUzgrZptdE3MHLlDQd7DF mChw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:reply-to:subject:references:to:from :message-id:date:user-agent:mime-version:in-reply-to:content-type :content-transfer-encoding; bh=WCT76WxiadKCKzWoXMQIhvDu6yYiwZHn5WQBA1nFcwY=; b=RiQsnCbIufCEZtroih8DLZ9RXWKGHlMJPGQ90tgFsGiBnKbPMAxgjgGTXE3HCFabnr ksy06G/imSulIjE38ImB8ZdeJ3K0BCFjHtTD6c/IKmzV8jFf6gH+hTYxI8eATbv4sJ1B m+FQGiJCUPJJpHdumONmGf3RWsdmG3/OEAz0ejp0rgZzpewbfKH68GKMpYJ5iVBKiYIR 5Iu5TkiAsayZEQwoW4WhMZZVl7IyJ2boCf/o+SwHlJgHwUTKBqG6GjJt8YLnxhYxfrcV G6uERHzbXjbHlOzzShdCBWumBkonI2zLxbwrpVx4roym4qdFgGR6hhWj+xRGADsHai2c FNSw== X-Gm-Message-State: AG10YOTfEwyIk5Cj3B1QWt6Yl7leGd3LZECAnLwdOMxqF7/rSBXHgBO/M37J4QLpE3GndQ== X-Received: by 10.67.22.166 with SMTP id ht6mr72011224pad.9.1455245420357; Thu, 11 Feb 2016 18:50:20 -0800 (PST) Received: from ?IPv6:2001:44b8:31ae:7b01:34bd:622d:2bb0:1afb? (2001-44b8-31ae-7b01-34bd-622d-2bb0-1afb.static.ipv6.internode.on.net. [2001:44b8:31ae:7b01:34bd:622d:2bb0:1afb]) by smtp.gmail.com with ESMTPSA id n78sm15206246pfb.53.2016.02.11.18.50.17 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Feb 2016 18:50:19 -0800 (PST) Sender: Kubilay Kocak Reply-To: koobs@FreeBSD.org Subject: Re: svn commit: r295529 - in head/sys: net netinet netinet6 References: <201602111707.u1BH7JIw040816@repo.freebsd.org> To: Devin Teske , src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org From: Kubilay Kocak Message-ID: <9afffb16-f65f-0ac7-fdb5-c92a1494a59e@FreeBSD.org> Date: Fri, 12 Feb 2016 13:50:09 +1100 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:45.0) Gecko/20100101 Thunderbird/45.0 MIME-Version: 1.0 In-Reply-To: <201602111707.u1BH7JIw040816@repo.freebsd.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Feb 2016 02:50:21 -0000 On 12/02/2016 4:07 AM, Devin Teske wrote: > Author: dteske > Date: Thu Feb 11 17:07:19 2016 > New Revision: 295529 > URL: https://svnweb.freebsd.org/changeset/base/295529 > > Log: > Merge SVN r295220 (bz) from projects/vnet/ > > Fix a panic that occurs when a vnet interface is unavailable at the time the > vnet jail referencing said interface is stopped. > > Sponsored by: FIS Global, Inc. Was/is there a bugzilla issue for this? Also, MFC and/or re (10.3-R) candidate? > Modified: > head/sys/net/route.c > head/sys/netinet/in_rmx.c > head/sys/netinet6/in6_rmx.c > Directory Properties: > head/ (props changed) > head/sys/ (props changed) > > Modified: head/sys/net/route.c > ============================================================================== > --- head/sys/net/route.c Thu Feb 11 16:54:23 2016 (r295528) > +++ head/sys/net/route.c Thu Feb 11 17:07:19 2016 (r295529) > @@ -353,10 +353,24 @@ rt_table_init(int offset) > return (rh); > } > > +static int > +rt_freeentry(struct radix_node *rn, void *arg) > +{ > + struct radix_head * const rnh = arg; > + struct radix_node *x; > + > + x = (struct radix_node *)rn_delete(rn + 2, NULL, rnh); > + if (x != NULL) > + R_Free(x); > + return (0); > +} > + > void > rt_table_destroy(struct rib_head *rh) > { > > + rn_walktree(&rh->rmhead.head, rt_freeentry, &rh->rmhead.head); > + > /* Assume table is already empty */ > rw_destroy(&rh->rib_lock); > free(rh, M_RTABLE); > > Modified: head/sys/netinet/in_rmx.c > ============================================================================== > --- head/sys/netinet/in_rmx.c Thu Feb 11 16:54:23 2016 (r295528) > +++ head/sys/netinet/in_rmx.c Thu Feb 11 17:07:19 2016 (r295529) > @@ -133,7 +133,8 @@ int > in_detachhead(void **head, int off) > { > > - return (rn_detachhead(head)); > + rt_table_destroy((struct rib_head *)(*head)); > + return (1); > } > #endif > > > Modified: head/sys/netinet6/in6_rmx.c > ============================================================================== > --- head/sys/netinet6/in6_rmx.c Thu Feb 11 16:54:23 2016 (r295528) > +++ head/sys/netinet6/in6_rmx.c Thu Feb 11 17:07:19 2016 (r295529) > @@ -237,7 +237,9 @@ in6_detachhead(void **head, int off) > { > > callout_drain(&V_rtq_mtutimer); > - return (rn_detachhead(head)); > + rt_table_destroy((struct rib_head *)(*head)); > + > + return (1); > } > #endif > > _______________________________________________ > svn-src-head@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/svn-src-head > To unsubscribe, send any mail to "svn-src-head-unsubscribe@freebsd.org" >