From owner-svn-src-all@FreeBSD.ORG Wed May 28 13:15:14 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E74D6AF3; Wed, 28 May 2014 13:15:14 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D434E25A4; Wed, 28 May 2014 13:15:14 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4SDFEUH061177; Wed, 28 May 2014 13:15:14 GMT (envelope-from glebius@svn.freebsd.org) Received: (from glebius@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4SDFEvc061176; Wed, 28 May 2014 13:15:14 GMT (envelope-from glebius@svn.freebsd.org) Message-Id: <201405281315.s4SDFEvc061176@svn.freebsd.org> From: Gleb Smirnoff Date: Wed, 28 May 2014 13:15:14 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r266806 - head/sys/netgraph X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Wed, 28 May 2014 13:15:15 -0000 Author: glebius Date: Wed May 28 13:15:14 2014 New Revision: 266806 URL: http://svnweb.freebsd.org/changeset/base/266806 Log: Use M_WAITOK for the NGM_PIPE_SET_CFG control message. We expect it to arrive from userland only. Submitted by: Dmitry Luhtionov Modified: head/sys/netgraph/ng_pipe.c Modified: head/sys/netgraph/ng_pipe.c ============================================================================== --- head/sys/netgraph/ng_pipe.c Wed May 28 13:06:53 2014 (r266805) +++ head/sys/netgraph/ng_pipe.c Wed May 28 13:15:14 2014 (r266806) @@ -471,7 +471,7 @@ parse_cfg(struct ng_pipe_hookcfg *curren if (hinfo->ber_p == NULL) hinfo->ber_p = malloc((MAX_FSIZE + MAX_OHSIZE) * sizeof(uint64_t), - M_NG_PIPE, M_NOWAIT); + M_NG_PIPE, M_WAITOK); current->ber = new->ber; /*