From owner-svn-src-head@freebsd.org Fri Jan 8 16:56:00 2016 Return-Path: Delivered-To: svn-src-head@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 8F901A68CB2; Fri, 8 Jan 2016 16:56:00 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: from mail-io0-x22b.google.com (mail-io0-x22b.google.com [IPv6:2607:f8b0:4001:c06::22b]) (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 5E1151C59; Fri, 8 Jan 2016 16:56:00 +0000 (UTC) (envelope-from adrian.chadd@gmail.com) Received: by mail-io0-x22b.google.com with SMTP id g73so94476863ioe.3; Fri, 08 Jan 2016 08:56:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=55AyKWDrVyiq2Zn4vSYDxktH24QXHGh9RWqKL9YWy9E=; b=iYh3L+WgEaBHmsLuzbrci6nVom19647aaazuOj7uX4wFQ+r0LFGRxDDII6Z6WOP47V 47PmNHFw50Ge+fW18AKZy8ANi4/98tnpdaJ6TKTyOZhgCYCwUmKVX1x08Or+kawAaSE3 Bbw1L3uAfWpYU95zpKO+P58dY0NX3dB9TYXD1NpBktiTs06YaBpj7dgnR8vf4C7YPAR4 oKefLyAFLaTjFQhGRSdLogc/Xe0WogSuyjH06Ue1e0g8gQtP7iIGAntseu0rxe13Re3+ 1eCBmVyn07WRlvyHZ7Md4TIePKCREG/Ty7J7rjGI4saCaEt9mKPZBGZzAsNBa8P0c0sg zJBw== MIME-Version: 1.0 X-Received: by 10.107.11.162 with SMTP id 34mr98018157iol.165.1452272159860; Fri, 08 Jan 2016 08:55:59 -0800 (PST) Received: by 10.36.121.202 with HTTP; Fri, 8 Jan 2016 08:55:59 -0800 (PST) In-Reply-To: <201601080116.u081G4Uj025386@repo.freebsd.org> References: <201601080116.u081G4Uj025386@repo.freebsd.org> Date: Fri, 8 Jan 2016 08:55:59 -0800 Message-ID: Subject: Re: svn commit: r293405 - head/sys/kern From: Adrian Chadd To: Gleb Smirnoff Cc: "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Jan 2016 16:56:00 -0000 there's been reported panics with this :( -a On 7 January 2016 at 17:16, Gleb Smirnoff wrote: > Author: glebius > Date: Fri Jan 8 01:16:03 2016 > New Revision: 293405 > URL: https://svnweb.freebsd.org/changeset/base/293405 > > Log: > For SOCK_STREAM socket use sbappendstream() instead of sbappend(). > > Modified: > head/sys/kern/uipc_usrreq.c > > Modified: head/sys/kern/uipc_usrreq.c > ============================================================================== > --- head/sys/kern/uipc_usrreq.c Fri Jan 8 01:12:27 2016 (r293404) > +++ head/sys/kern/uipc_usrreq.c Fri Jan 8 01:16:03 2016 (r293405) > @@ -981,7 +981,7 @@ uipc_send(struct socket *so, int flags, > control)) > control = NULL; > } else > - sbappend_locked(&so2->so_rcv, m); > + sbappendstream_locked(&so2->so_rcv, m, flags); > break; > > case SOCK_SEQPACKET: { >