From owner-svn-src-all@freebsd.org Mon Aug 8 23:38:38 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 E1B40BB3A78; Mon, 8 Aug 2016 23:38:38 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: from mail-pf0-x243.google.com (mail-pf0-x243.google.com [IPv6:2607:f8b0:400e:c00::243]) (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 A1A0611F6; Mon, 8 Aug 2016 23:38:38 +0000 (UTC) (envelope-from markjdb@gmail.com) Received: by mail-pf0-x243.google.com with SMTP id i6so25824778pfe.0; Mon, 08 Aug 2016 16:38:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=9rwyVtGn8TQuZU5A2Qa50Ps+xDxZU1opk0qRGRaraiA=; b=WXiEMmbRaewS3dUMWI2GxxN+D5GD8ByyU7EJ9Gqh8zkku40Hccnry7JRHEgaIf7Qjc Izw2XFhwlQ5Wv2XnSfhxncnMtUXFaqal9XC1rw5uIHMLGKK8x/4RT6QIFr3pcfaGs33O 77GcRno/5KECKQGeT2Ju5L1XJf2w44OaNjW5AFuypvcXSEfNqVEQvauigVUtstvo5sTL ol3gYMDej7fYnKOn9GgOydjOaCzDwJTIuh1DbPwm9ejeaeBNaJ7+dcaXlQIlNWW+kvTt vXUZXVLOF0WdKZuDPhpsbiOXxvxW/HsRZwyHrrK7XEVGUEkjSUsx3hnLiY2J6YBIA6tv P22A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:date:from:to:cc:subject:message-id :references:mime-version:content-disposition:in-reply-to:user-agent; bh=9rwyVtGn8TQuZU5A2Qa50Ps+xDxZU1opk0qRGRaraiA=; b=FNa09grv4A7aXSmCLy1fxsco9Y7+1+2tonxxHZCsy9y753wJaNqkF2lY6ydHulvBBA w6uwzdOdnkLo8DYGK+out0rNTqc3Vwa+h4l851F14d+BJsv0jhWVxJQMqvLyq24ThkIP J3AJePB0+j8waVBpHZi107vNJxCrgkUbZV7lAujJJbQZPsp28XOSdBNXMOLxvHf8XK+p 21FHik5tULsh+oZaEzzWhNCnGC0abjBhq1yT+0qP+tmYGv911Uy7qVu4lm6z8Q0bdLeA ZsFvRhxuJZHAhks35odHkk6BSmSO7xBiddkuh1qL4qde7CpDgkeXkjq6pWyntnAaMgHn 6IOQ== X-Gm-Message-State: AEkoout5Ec8OUSgoBtoqJVKdk1i1SgwzJrxT2LFkhxhPw8mubUCcxlTk8m7xawZLWYrRkg== X-Received: by 10.98.213.130 with SMTP id d124mr167013863pfg.118.1470699518212; Mon, 08 Aug 2016 16:38:38 -0700 (PDT) Received: from wkstn-mjohnston.west.isilon.com (c-76-104-201-218.hsd1.wa.comcast.net. [76.104.201.218]) by smtp.gmail.com with ESMTPSA id h1sm50756607pay.48.2016.08.08.16.38.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Aug 2016 16:38:37 -0700 (PDT) Sender: Mark Johnston Date: Mon, 8 Aug 2016 16:43:32 -0700 From: Mark Johnston To: Oliver Pinter Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Subject: Re: svn commit: r303855 - in head/sys: kern sys Message-ID: <20160808234332.GA22449@wkstn-mjohnston.west.isilon.com> References: <201608082025.u78KP4aE048791@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.6.1 (2016-04-27) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.22 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: Mon, 08 Aug 2016 23:38:39 -0000 On Tue, Aug 09, 2016 at 12:53:47AM +0200, Oliver Pinter wrote: > Hi! > > Can you please MFC back this change 10-STABLE together with the > following: https://github.com/HardenedBSD/hardenedBSD/commit/576619e564618bca3675db57580d8e1f76bd2ac7 > > This issue is still exists on 10-STABLE, as you can test with the > linked program from phabricator: > https://people.freebsd.org/~mjg/reproducers/unp-gc-panic.c Hm, I don't think this could be MFCed directly. It changes the kernel ABI by modifying the argument of dom_dispose(). This could be fixed in stable/10 with a hack to call the unix domain socket code directly when appropriate, which I think is preferable to the current state of things. I'll look into it further. > > On Mon, Aug 8, 2016 at 10:25 PM, Mark Johnston wrote: > > Author: markj > > Date: Mon Aug 8 20:25:04 2016 > > New Revision: 303855 > > URL: https://svnweb.freebsd.org/changeset/base/303855 > > > > Log: > > Handle races with listening socket close when connecting a unix socket. > > > > If the listening socket is closed while sonewconn() is executing, the > > nascent child socket is aborted, which results in recursion on the > > unp_link lock when the child's pru_detach method is invoked. Fix this > > by using a flag to mark such sockets, and skip a part of the socket's > > teardown during detach. > > > > Reported by: Raviprakash Darbha > > Tested by: pho > > MFC after: 2 weeks > > Differential Revision: https://reviews.freebsd.org/D7398 > > > > Modified: > > head/sys/kern/uipc_usrreq.c > > head/sys/sys/unpcb.h > > > > Modified: head/sys/kern/uipc_usrreq.c > > ============================================================================== > > --- head/sys/kern/uipc_usrreq.c Mon Aug 8 20:23:11 2016 (r303854) > > +++ head/sys/kern/uipc_usrreq.c Mon Aug 8 20:25:04 2016 (r303855) > > @@ -430,6 +430,8 @@ uipc_attach(struct socket *so, int proto > > unp->unp_socket = so; > > so->so_pcb = unp; > > unp->unp_refcount = 1; > > + if (so->so_head != NULL) > > + unp->unp_flags |= UNP_NASCENT; > > > > UNP_LIST_LOCK(); > > unp->unp_gencnt = ++unp_gencnt; > > @@ -652,14 +654,22 @@ uipc_detach(struct socket *so) > > unp = sotounpcb(so); > > KASSERT(unp != NULL, ("uipc_detach: unp == NULL")); > > > > - UNP_LINK_WLOCK(); > > + vp = NULL; > > + local_unp_rights = 0; > > + > > UNP_LIST_LOCK(); > > - UNP_PCB_LOCK(unp); > > LIST_REMOVE(unp, unp_link); > > unp->unp_gencnt = ++unp_gencnt; > > --unp_count; > > UNP_LIST_UNLOCK(); > > > > + if ((unp->unp_flags & UNP_NASCENT) != 0) { > > + UNP_PCB_LOCK(unp); > > + goto teardown; > > + } > > + UNP_LINK_WLOCK(); > > + UNP_PCB_LOCK(unp); > > + > > /* > > * XXXRW: Should assert vp->v_socket == so. > > */ > > @@ -687,6 +697,7 @@ uipc_detach(struct socket *so) > > } > > local_unp_rights = unp_rights; > > UNP_LINK_WUNLOCK(); > > +teardown: > > unp->unp_socket->so_pcb = NULL; > > saved_unp_addr = unp->unp_addr; > > unp->unp_addr = NULL; > > @@ -1473,6 +1484,7 @@ unp_connect2(struct socket *so, struct s > > > > if (so2->so_type != so->so_type) > > return (EPROTOTYPE); > > + unp2->unp_flags &= ~UNP_NASCENT; > > unp->unp_conn = unp2; > > > > switch (so->so_type) { > > > > Modified: head/sys/sys/unpcb.h > > ============================================================================== > > --- head/sys/sys/unpcb.h Mon Aug 8 20:23:11 2016 (r303854) > > +++ head/sys/sys/unpcb.h Mon Aug 8 20:25:04 2016 (r303855) > > @@ -103,11 +103,6 @@ struct unpcb { > > #define UNP_WANTCRED 0x004 /* credentials wanted */ > > #define UNP_CONNWAIT 0x008 /* connect blocks until accepted */ > > > > -#define UNPGC_REF 0x1 /* unpcb has external ref. */ > > -#define UNPGC_DEAD 0x2 /* unpcb might be dead. */ > > -#define UNPGC_SCANNED 0x4 /* Has been scanned. */ > > -#define UNPGC_IGNORE_RIGHTS 0x8 /* Attached rights are freed */ > > - > > /* > > * These flags are used to handle non-atomicity in connect() and bind() > > * operations on a socket: in particular, to avoid races between multiple > > @@ -115,6 +110,15 @@ struct unpcb { > > */ > > #define UNP_CONNECTING 0x010 /* Currently connecting. */ > > #define UNP_BINDING 0x020 /* Currently binding. */ > > +#define UNP_NASCENT 0x040 /* Newborn child socket. */ > > + > > +/* > > + * Flags in unp_gcflag. > > + */ > > +#define UNPGC_REF 0x1 /* unpcb has external ref. */ > > +#define UNPGC_DEAD 0x2 /* unpcb might be dead. */ > > +#define UNPGC_SCANNED 0x4 /* Has been scanned. */ > > +#define UNPGC_IGNORE_RIGHTS 0x8 /* Attached rights are freed */ > > > > #define sotounpcb(so) ((struct unpcb *)((so)->so_pcb)) > > > > _______________________________________________ > > 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"